Commit Graph

56494 Commits

Author SHA1 Message Date
Automerger Merge Worker f7ad6f22da Merge "[GWP-ASan] Add GWP-ASan information to tombstones." am: 2dd81da3b4
Change-Id: I708936c9139c020963bff5879eb07385946e34f1
2020-02-19 22:14:27 +00:00
Mitch Phillips 2dd81da3b4 Merge "[GWP-ASan] Add GWP-ASan information to tombstones." 2020-02-19 20:35:10 +00:00
Automerger Merge Worker f45c016896 Merge "Incremental installations in adb, client/host side." am: 2bca658a3b
Change-Id: I1c9cf39207a6f29c9d0294f3d32c5fe234931bb4
2020-02-19 19:50:08 +00:00
Yurii Zubrytskyi 2bca658a3b Merge "Incremental installations in adb, client/host side." 2020-02-19 19:25:10 +00:00
Automerger Merge Worker c798ade67a Merge "Rename ro.device_owner system property" am: db6650a905
Change-Id: Ia35df5e63121b72cad532f463378a1f5aec16314
2020-02-19 17:30:07 +00:00
Treehugger Robot db6650a905 Merge "Rename ro.device_owner system property" 2020-02-19 17:12:43 +00:00
Alex Buynytskyy 96ff54bf34 Incremental installations in adb, client/host side.
Test: adb install --incremental <apk>

Change-Id: I74e3eaf9718a16272bc533bc8298dfcf81120caa
2020-02-19 08:01:06 -08:00
Rubin Xu 7a5cbfc645 Rename ro.device_owner system property
This is renamed to ro.organization_owned to cover the extended
usage now that there is a new management mode for fully-managed
organization owned devices: organization-owned managed profile.
A device is considered fully-managed if there is a device owner
or an organization-owned managed profile.

Test: atest liblog-unit-tests
Test: atest propertyinfoserializer_tests
Bug: 148437300
Change-Id: Iaa8ea246c973732526abc1da5b307af8bce1a0af
2020-02-19 10:34:36 +00:00
Automerger Merge Worker df4f865d7a Merge "Add project ID constants." am: 529605bc9e
Change-Id: Id45fd2d85024e5200fecc1f78d5fb9126c405a4c
2020-02-19 05:36:36 +00:00
Martijn Coenen 529605bc9e Merge "Add project ID constants." 2020-02-19 05:23:20 +00:00
Automerger Merge Worker 73b4968059 Merge "Allow apexes to link against more libs" am: 6c364f94ad
Change-Id: I446ffa9ac83122d3f31258f658d4393d42e26e38
2020-02-19 01:35:33 +00:00
Martijn Coenen 1cc2f9d77f Add project ID constants.
These will be used for quota tracking on external storage devices
that don't have sdcardfs.

Bug: 146419093
Test: N/A
Change-Id: If00961cc3807bcc3e93675e5d27dd6444007fdba
2020-02-18 17:19:09 -08:00
Howard Ro 6c364f94ad Merge "Allow apexes to link against more libs" 2020-02-19 01:17:09 +00:00
Mitch Phillips e0b4bb1b2e [GWP-ASan] Add GWP-ASan information to tombstones.
GWP-ASan can provide information about a crash that it caused. Grab the
GWP-ASan regions from the globals shared by the linker for crash-handler
purpopses, pull the information from GWP-ASan, and display it.

This adds two regions:
 1. Causality tracking by GWP-ASan. We now print a cause header about
 the crash, like `Cause: [GWP-ASan]: Use After Free on a 1-byte
 allocation at 0x7365bb3ff8`
 2. Allocation and deallocation stack traces.

Bug: 135634846
Test: atest debuggerd_test

Change-Id: Id28d5400c9a9a053fcde83a4788f971e677d4643
2020-02-18 16:49:50 -08:00
Automerger Merge Worker ca03b68e12 Merge "Add wrapped key support for metadata encryption" am: 5ed0698b41
Change-Id: I33f5d8954379622f7bc6e8af5a95deb0962208f7
2020-02-18 23:39:37 +00:00
Paul Crowley 5ed0698b41 Merge "Add wrapped key support for metadata encryption" 2020-02-18 23:17:06 +00:00
Automerger Merge Worker e690cb7b4f Merge "Specify argument types for function prototype" am: 83c7d04493
Change-Id: I8b3c72616dd1cebfa4d34553fd7307cf48837fbb
2020-02-18 23:02:28 +00:00
Tom Cherry 83c7d04493 Merge "Specify argument types for function prototype" 2020-02-18 22:44:58 +00:00
Automerger Merge Worker 7a15d5c88f Merge "Some minor fixes to libadb_tls_connection." am: 8f04b0ca58
Change-Id: Ief005e48c622a3221d83e8f06beb1de125048233
2020-02-18 22:24:01 +00:00
Joshua Duong 8f04b0ca58 Merge "Some minor fixes to libadb_tls_connection." 2020-02-18 22:15:00 +00:00
Joshua Duong 663b3c9d88 Some minor fixes to libadb_tls_connection.
Bug: 111434128

Test: atest adb_tls_connection_test
Exempt-From-Owner-Approval: approved
Change-Id: I4c23cc6ba5b14b65122e61297554dedabf43d0b4
2020-02-18 22:14:48 +00:00
Treehugger Robot 5c2dc9c222 Merge "Add UNSUPPORTED to health HAL 2.1 values" am: 9d261c3fed
Change-Id: I18dc62b92725d3061772d5069558af688a99573b
2020-02-18 21:12:32 +00:00
Treehugger Robot b149d7a2bf Merge "logcat: add 'device shut down' to error message upon EOF" am: 4862127432
Change-Id: Ic3708581f9d42ea6cb8fd38bf990509d43bfbf2e
2020-02-18 20:51:30 +00:00
Treehugger Robot 9d261c3fed Merge "Add UNSUPPORTED to health HAL 2.1 values" 2020-02-18 20:45:15 +00:00
Barani Muthukumaran 2ca1d83ddb Add wrapped key support for metadata encryption
Change metadata_cipher fstab option to metadata_encryption
that includes encryption flags in addition to the cipher.
wrappedkey_v0 encryption flag is used to denote that the
inline encryption hardware supports wrapped keys. dm-default-key
device is created and a wrappedkey is provided along with the
optional wrappedkey_v0 argument.

Bug: 147733587

Test: FBE validation with Fscrypt v2 + inline crypt + wrapped
key changes kernel and metadata encryption with wrapped key.

Change-Id: Id1a18db175680dd6b0adb4594d06566eb1285785
2020-02-18 12:44:40 -08:00
Anders Frostad Pedersen c54b30e106 Specify argument types for function prototype
__android_log_get_minimum_priority caused build failures
when used in combination with strict prototypes compiler flags.

Fix this by specifying void argument.

Bug: 116329414
Bug: 119867234
Change-Id: Icbb8f66a5e35f02b57d772f5acdb9de8638d252c
Test: Manual
2020-02-18 20:25:54 +00:00
Treehugger Robot 4862127432 Merge "logcat: add 'device shut down' to error message upon EOF" 2020-02-18 18:23:09 +00:00
Treehugger Robot 95c67d0cda Merge "libsnapshot: Temporarily disable flaky ImageManagerTest" am: cf4f56df9f
Change-Id: I5e717953bc7443bd883a4da62f99f5e7356b2069
2020-02-18 18:01:58 +00:00
Treehugger Robot cf4f56df9f Merge "libsnapshot: Temporarily disable flaky ImageManagerTest" 2020-02-18 17:43:00 +00:00
Alessio Balsini 41b00ca46e libsnapshot: Temporarily disable flaky ImageManagerTest
This test was causing the failure of vts_libsnapshot_test.
Disable until a fix is found and tests are stable again.

Bug: 149738928
Test: atests vts_libsnapshot_test
Change-Id: Ibbe5cd72aad93d9ade4ac1542f08dec9cd926a3b
Signed-off-by: Alessio Balsini <balsini@google.com>
2020-02-18 15:53:45 +00:00
Alessio Balsini c16d61d661 Merge "SnaspshotManager uses SnapshotMergeStats" am: beb3125d3d
Change-Id: I1ac79aea1c1067ab0b13bc4c7095cdc9f58b4adb
2020-02-18 11:02:16 +00:00
Alessio Balsini beb3125d3d Merge "SnaspshotManager uses SnapshotMergeStats" 2020-02-18 10:52:47 +00:00
Treehugger Robot 2ef5b50b56 Merge "base: remove Errorf/ErrnoErrorf work around" am: b9ac1178aa
Change-Id: I66fea07333752e2c149dba8963c583cf72d781de
2020-02-18 05:30:16 +00:00
Joshua Duong 73447676aa Merge changes from topic "adbwifi-client-mdns" am: a71ba615ea
Change-Id: I621b1667dd42fca057c2ac992bf1fa4f988555af
2020-02-18 05:30:03 +00:00
Treehugger Robot b9ac1178aa Merge "base: remove Errorf/ErrnoErrorf work around" 2020-02-18 05:20:14 +00:00
Joshua Duong a71ba615ea Merge changes from topic "adbwifi-client-mdns"
* changes:
  add a version TXT record to adb secure mdns services
  adbd: only register dnsservices via explicit API
  adb client interface for secure services
  get the ip address info for all DNS services
  make the client browse for appropriate mdns services
  Add mDNS services for pairing and connect
2020-02-18 05:14:19 +00:00
Lingfeng Yang 39e54b8c5b add a version TXT record to adb secure mdns services
In the context of secure connect, allows adbd and host adb to reject
each other based on incompatible versions without even having to
actually connect (since it is a DNS TXT).

Bug: 111434128, 119490749

Test: N/A
Exempt-From-Owner-Approval: already approved
Change-Id: I54312d8b67370c397ba81ecdbca1b27e3ee58572
2020-02-18 05:13:06 +00:00
Lingfeng Yang 615036f494 adbd: only register dnsservices via explicit API
For privacy/security reasons, let's not broadcast the adb secure
services on startup automatically, and instead leave that up to
the rest of the adbd code somehow.

Instead, this CL adds an API in daemon/mdns.h that lets the user
control when registration happens, potentially only doing so if
the developer option is enabled or something.

Bug: 111434128, 119490749

Test: N/A
Exempt-From-Owner-Approval: already approved
Change-Id: Idc994a59ef9e5d48f08796c21989883497e19ef8
2020-02-18 05:12:52 +00:00
Lingfeng Yang cef4ade8e1 adb client interface for secure services
This CL exposes a callback-based interface to perform some action for
each resolved pairing/connect service as a function of their hostname,
ip address, and port.

The ADB client can then use this information to either set up secure
connections directly, or to tell the adb host server to do so, or
something.

Bug: 111434128, 119490749

Test: N/A
Exempt-From-Owner-Approval: already approved
Change-Id: I2dd04c322df5b0597859f44703cfd2f3f29fd737
2020-02-18 05:12:36 +00:00
Lingfeng Yang 4b62bcde04 get the ip address info for all DNS services
This CL adds functionality to the class ResolvedService where the ip
address associated with a resolved DNS service is recorded.

It also avoids connecting to the device unless it is the Things-related
DNS service.

Next step is to add some kind of interface in other parts of adb code
to retrieve these IP addresses.

Bug: 111434128, 119490749

Test: N/A
Exempt-From-Owner-Approval: already approved
Change-Id: I46895a7a5bf5660f524c7323a9454f1e2c7d385c
2020-02-18 05:12:25 +00:00
Lingfeng Yang c712f2db76 make the client browse for appropriate mdns services
This CL makes it so the client looks for the adb secure pairing
and adb secure connect services. Nothing else should happen,
but this should be useful to see if the right packet traffic for
discoverability is happening.

Bug: 111434128, 119490749

Test: N/A
Exempt-From-Owner-Approval: already approved
Change-Id: I266bdb8526cf39bbfa131344dca2b1bb14c14a7b
2020-02-18 05:10:52 +00:00
Lingfeng Yang be49d8a2a9 Add mDNS services for pairing and connect
- ADB Secure Pairing
- ADB Secure Connect

Nothing else is implemented.

Bug: 111434128, 119490749

Test: N/A
Exempt-From-Owner-Approval: already approved
Change-Id: I2e7873b62a3c7631451e47f6a301f8c4a5ffa2e2
2020-02-18 05:07:32 +00:00
Treehugger Robot e6060c927c Merge "Utility class to measure snapshot merge duration" am: e87527faa3
Change-Id: I951e71eacee17d5ecf1f3b3edca2beb7d2ad38dd
2020-02-18 02:26:43 +00:00
Treehugger Robot e87527faa3 Merge "Utility class to measure snapshot merge duration" 2020-02-18 02:12:16 +00:00
Alessio Balsini adfa9fddd9 SnaspshotManager uses SnapshotMergeStats
The SnapshotMergeStats class is issued by SnapshotManager to track the
merge duration and possible reboots during the merge process.

Bug: 138817833
Test: m
Change-Id: I04e53bb8f6aa9e740c0dcc77c3a9566383954fba
Signed-off-by: Alessio Balsini <balsini@google.com>
2020-02-17 16:38:21 +00:00
Alessio Balsini cd3915d2e7 Utility class to measure snapshot merge duration
With the Virtual A/B feature, when the device successfully boots after an OTA
update, a dm-snapshot merge operation is performed, which consolidates the
updated images to the base devices.  This merge operation depends on the OTA
size and may affect the device performance until completed.
Create the SnapshotMergeStats class that takes care of measuring the duration
of a merge operation and manages the merge state file to continue tracking the
merge in the case of an interruption due to a reboot.

Bug: 138817833
Test: m
Change-Id: I9dcf1423716c89d8f9b4a0feb4e75bb7b9d18935
Signed-off-by: Alessio Balsini <balsini@google.com>
2020-02-17 16:36:36 +00:00
Treehugger Robot 054e278ab1 Merge "snapshot: helper to get access snapshot_state path" am: 34ad19f4c4
Change-Id: I7088d6cf474ec65522315ff11597941ded130f79
2020-02-17 12:44:04 +00:00
Treehugger Robot 34ad19f4c4 Merge "snapshot: helper to get access snapshot_state path" 2020-02-17 12:31:49 +00:00
Stephane Lee 06846044fe Add UNSUPPORTED to health HAL 2.1 values
Bug: 149429835
Test: lshal debug android.hardware.health@2.1::IHealth/default
Change-Id: Ibbcd89f38ed9ec2966b31854ab1cbe218c8e19cb
2020-02-15 16:51:02 -08:00
Wei Wang a7a1a9690e Merge "fsmgr: print unabbreviated log when exec child commands" am: 71fcaf5726
Change-Id: If6d6bf1bedf703357c25f8179ab1a0958290b681
2020-02-15 07:26:16 +00:00