Commit Graph

58450 Commits

Author SHA1 Message Date
Bowgo Tsai b697d47eb3 Adding new GSI public keys
Adding two new public keys for R-Developer-GSI and S-Developer-GSI,
respectively.

Bug: 149805495
Test: m r-developer-gsi.avbpubkey
Test: m s-developer-gsi.avbpubkey
Change-Id: Iaa7521ef40b94f13fe3c9c61d276678f47c60b98
2020-02-19 08:50:26 +00:00
Automerger Merge Worker 3781fb4a9a Merge "Add project ID constants." am: 529605bc9e am: df4f865d7a
Change-Id: I6bc3a58b35d13975545ebfa9dc75d69bcae132c7
2020-02-19 05:55:55 +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 32545e5c21 Merge "Allow apexes to link against more libs" am: 6c364f94ad am: 73b4968059
Change-Id: Ib677c8a314a668dd7f21849b687f133982a10f5c
2020-02-19 01:47:10 +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
Muhammad Qureshi 3a40ee5402 //apex_available:platform should be first in list
Test: m
Change-Id: I6ede6f008bc149f587ae2fc024d5869463b2c64d
2020-02-18 17:05:19 -08: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 1427fe5c6f Merge "Add wrapped key support for metadata encryption" am: 5ed0698b41 am: ca03b68e12
Change-Id: I494fb74aae05a0a61afddbe162d2fceeedff3ac0
2020-02-19 00:05:22 +00: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
Automerger Merge Worker 1cb9820545 Merge "Specify argument types for function prototype" am: 83c7d04493 am: e690cb7b4f
Change-Id: I9ba3b48dc147dbb007a90a16e304a995195d56ba
2020-02-18 23:26:09 +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 4a36b59bfc Merge "Some minor fixes to libadb_tls_connection." am: 8f04b0ca58 am: 7a15d5c88f
Change-Id: I32238ce9abd608ff290d903df5b75fdd81d49cae
2020-02-18 22:37:43 +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
Automerger Merge Worker 4391aab160 Merge "Add UNSUPPORTED to health HAL 2.1 values" am: 9d261c3fed am: 5c2dc9c222
Change-Id: I297e11670c1fe5893f1d81ab5b6ef6ae6e181b82
2020-02-18 21:13: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
Automerger Merge Worker 00079b339a [automerger skipped] Increase timeouts. am: 3cd6902733 -s ours am: a686b5d633 -s ours
am skip reason: Change-Id Ia3c95dccc3076a3fd5ef6432097a57e4ccee4df3 with SHA-1 11555f0961 is in history

Change-Id: I79775d428ff26ade1f7e7837f64e079c07fb129a
2020-02-18 21:08:41 +00:00
Automerger Merge Worker d578dea00b [automerger skipped] Add TEMP_FAILURE_RETRY where appropriate. am: 7d79742f05 -s ours am: 86fba120a9 -s ours
am skip reason: Change-Id I87b912e76889ed207ab17b862e4786ee44a382ba with SHA-1 172b0a0834 is in history

Change-Id: I64de77c9bc39560f0a47cde506a6b093385426a6
2020-02-18 21:08:38 +00:00
Automerger Merge Worker f260714374 [automerger skipped] Increase timeout to avoid flaky tests. am: 4cba155da9 -s ours am: 9c1f828345 -s ours
am skip reason: Change-Id I3404549db0ac18a4a82a99b2620556db96376bca with SHA-1 afc0ff7fe0 is in history

Change-Id: Ia812ce0d2d248a00e4b7c588379bf28c0f531a5d
2020-02-18 21:08:36 +00:00
Automerger Merge Worker 4a5cc17420 Merge "logcat: add 'device shut down' to error message upon EOF" am: 4862127432 am: b149d7a2bf am: bc615f646b
Change-Id: Iaa96cbc08c823114e0ea65a2f73107cb4a2e4382
2020-02-18 21:08:24 +00:00
Automerger Merge Worker da7ff346a5 Merge "libsnapshot: Temporarily disable flaky ImageManagerTest" am: cf4f56df9f am: 95c67d0cda am: 4a505420b7
Change-Id: I766615b567ac0687969dfdb5830f19de4d51fde4
2020-02-18 21:08:06 +00:00
Automerger Merge Worker a686b5d633 [automerger skipped] Increase timeouts. am: 3cd6902733 -s ours
am skip reason: Change-Id Ia3c95dccc3076a3fd5ef6432097a57e4ccee4df3 with SHA-1 11555f0961 is in history

Change-Id: Ie9575840f7b5daa0f3bddda872025a525a208435
2020-02-18 20:54:20 +00:00
Automerger Merge Worker 86fba120a9 [automerger skipped] Add TEMP_FAILURE_RETRY where appropriate. am: 7d79742f05 -s ours
am skip reason: Change-Id I87b912e76889ed207ab17b862e4786ee44a382ba with SHA-1 172b0a0834 is in history

Change-Id: Ib132a4a8658439b7a36e6f272db833e52c1774a9
2020-02-18 20:54:17 +00:00
Automerger Merge Worker 9c1f828345 [automerger skipped] Increase timeout to avoid flaky tests. am: 4cba155da9 -s ours
am skip reason: Change-Id I3404549db0ac18a4a82a99b2620556db96376bca with SHA-1 afc0ff7fe0 is in history

Change-Id: I58fbc14f452aadd127ff69c75974e10a192dcb2c
2020-02-18 20:54:14 +00:00
Treehugger Robot bc615f646b Merge "logcat: add 'device shut down' to error message upon EOF" am: 4862127432 am: b149d7a2bf
Change-Id: I166ba78cdd77f1c29a7ac681692324e012401a4e
2020-02-18 20:53:52 +00:00
Treehugger Robot 4a505420b7 Merge "libsnapshot: Temporarily disable flaky ImageManagerTest" am: cf4f56df9f am: 95c67d0cda
Change-Id: I42582c0bc338f6ea2e5fbaef72d5f96e14f36270
2020-02-18 20:53:39 +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 6a8a7c2e20 snapshotctl: send snapshot merge report metrics
Add the --report flag to spshotctl to submit Android metrics on the final state
of the snapshot merge operation, the duration if the merge is completed in a
single session, or the number of reboots that happened before completing the
merge.

Bug: 138817833
Bug: 148138124
Test: m + OTA + statsd_testdrive
Change-Id: Id657f33963bb9926553fa6eeb1721a5229f11e87
Signed-off-by: Alessio Balsini <balsini@google.com>
2020-02-18 15:21:56 +00:00
Alessio Balsini 43ae37ba1f Merge "SnaspshotManager uses SnapshotMergeStats" am: beb3125d3d am: c16d61d661 am: 80ce91a5be
Change-Id: I1eab478e557cf675ed700b7041d4faa052288106
2020-02-18 11:35:32 +00:00
Alessio Balsini 80ce91a5be Merge "SnaspshotManager uses SnapshotMergeStats" am: beb3125d3d am: c16d61d661
Change-Id: I3cbdb945882918a7de9ffb9d471ffbe517413ef6
2020-02-18 11:21:17 +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 fa9e5f1690 Merge "base: remove Errorf/ErrnoErrorf work around" am: b9ac1178aa am: 2ef5b50b56 am: 96307c24dd
Change-Id: I8bedce0d4e4cec39b146f91319dc1df38339daac
2020-02-18 06:04:01 +00:00
Joshua Duong 788b308188 Merge changes from topic "adbwifi-client-mdns" am: a71ba615ea am: 73447676aa am: 560b4a0c94
Change-Id: Ica35bc1d72ed33a2693166a54893491647cdb12d
2020-02-18 06:03:26 +00:00
Treehugger Robot 96307c24dd Merge "base: remove Errorf/ErrnoErrorf work around" am: b9ac1178aa am: 2ef5b50b56
Change-Id: I99619826f0919b0578099e2ab55691a37d9f8dc2
2020-02-18 05:45:53 +00:00
Joshua Duong 560b4a0c94 Merge changes from topic "adbwifi-client-mdns" am: a71ba615ea am: 73447676aa
Change-Id: Ifc9736f4ab3940ad48e16691d3d0cae33adea315
2020-02-18 05:45:42 +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