Commit graph

67694 commits

Author SHA1 Message Date
Bernie Innocenti
d2a4c1f841 Merge "Add explicit Result::ok() checks where needed" am: bc053268cf am: 0b0c5424a8
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1229625

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I66dafc280da0421afccadcd6c1c24e74dc306bf2
2020-12-21 19:20:02 +00:00
Bernie Innocenti
0b0c5424a8 Merge "Add explicit Result::ok() checks where needed" am: bc053268cf
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1229625

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id1786f12c81fc044a99548dbdbcc620c6bb20b3b
2020-12-21 18:42:25 +00:00
Bernie Innocenti
bc053268cf Merge "Add explicit Result::ok() checks where needed" 2020-12-21 18:31:58 +00:00
Bernie Innocenti
062ef5356d Add explicit Result::ok() checks where needed
Test: m checkbuild continuous_instrumentation_tests continuous_instrumentation_tests_api_coverage continuous_native_tests device-tests platform_tests
Exempt-From-Owner-Approval: mechanical mass refactoring
Change-Id: I8d40b1e3cb5d2f76baf77b8a190df4366909f7b6
2020-12-20 17:06:17 +00:00
Bernie Innocenti
a7a0ea5a51 Merge "Add explicit Result::has_value() checks where needed" am: 989efb67e3 am: 32ffd0d4ca
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1533183

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idb3622bb54025e5f7e1c68d4f6eb2c399edec9dc
2020-12-20 08:06:27 +00:00
Bernie Innocenti
32ffd0d4ca Merge "Add explicit Result::has_value() checks where needed" am: 989efb67e3
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1533183

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib6bd423a7ececfa7fc076542206ee0d0bf385c84
2020-12-20 07:51:19 +00:00
Bernie Innocenti
989efb67e3 Merge "Add explicit Result::has_value() checks where needed" 2020-12-20 07:36:38 +00:00
Bernie Innocenti
62ba2b11b1 Add explicit Result::has_value() checks where needed
Test: m checkbuild continuous_instrumentation_tests continuous_instrumentation_tests_api_coverage continuous_native_tests device-tests platform_tests
Change-Id: Ifd5dcda48e370d750e243d427e68a77dce333951
2020-12-19 21:17:16 +09:00
Treehugger Robot
eb9ef06e6c Merge "ueventd: Fix property variable for ro.hardware in ueventd.rc" am: cf110de8d2 am: dbf85defc0
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1531439

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2ed311c35c3cbc224b759cb7a6260580883d2483
2020-12-16 14:19:46 +00:00
Treehugger Robot
dbf85defc0 Merge "ueventd: Fix property variable for ro.hardware in ueventd.rc" am: cf110de8d2
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1531439

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If8b319379ad51ce504b01b2c0236d4c78a86218b
2020-12-16 14:06:52 +00:00
Treehugger Robot
cf110de8d2 Merge "ueventd: Fix property variable for ro.hardware in ueventd.rc" 2020-12-16 13:38:48 +00:00
Youkichi Hosoi
63fdd1ba24 ueventd: Fix property variable for ro.hardware in ueventd.rc
Property variables should be written ${x.y} to be expanded.

Bug: 175645356
Test: The property ro.hardware is expanded properly.
Change-Id: Idf7ff7ecc002e6e4de4ccef70e89dcc1c10e63d0
2020-12-16 15:54:15 +09:00
David Anderson
3560ce3db6 Merge changes from topic "snapuserd-gflags" am: 819ca32a0a am: 88f05d08b6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1527880

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9fa56877df4b0b33ed88a42bd995a9a8e020dc5b
2020-12-15 22:03:03 +00:00
David Anderson
88f05d08b6 Merge changes from topic "snapuserd-gflags" am: 819ca32a0a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1527880

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie05053e6a32a9430b9daa2225cb3ecaa4c670523
2020-12-15 21:27:23 +00:00
David Anderson
819ca32a0a Merge changes from topic "snapuserd-gflags"
* changes:
  snapuserd: Add a no-socket mode.
  snapuserd: Use gflags for arguments.
2020-12-15 21:05:24 +00:00
Tri Vo
a4bc94af5c Merge "trusty: Retrieve coverage PCs from coverage record" am: 56bcb02b6e am: ba9b86a5ec
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1501022

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0616b1fc1a6e0eb47185b397ba3bdc0c3871f690
2020-12-15 20:37:49 +00:00
Christopher Ferris
1e0c4c415b Merge "Update for v5.10 kernel headers." am: 2047676149 am: b4993d01f0
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1529739

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3b6efc94ddcaacb8dfc4944750ba34240487c26e
2020-12-15 20:37:35 +00:00
Tri Vo
ba9b86a5ec Merge "trusty: Retrieve coverage PCs from coverage record" am: 56bcb02b6e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1501022

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibc4ee7a0a8a746f915119a53765809d5f3f88af8
2020-12-15 20:20:07 +00:00
Tri Vo
56bcb02b6e Merge "trusty: Retrieve coverage PCs from coverage record" 2020-12-15 20:15:08 +00:00
Christopher Ferris
b4993d01f0 Merge "Update for v5.10 kernel headers." am: 2047676149
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1529739

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5f553f69c24569f15fc43eb73d3823c26dc281ff
2020-12-15 20:04:17 +00:00
Christopher Ferris
2047676149 Merge "Update for v5.10 kernel headers." 2020-12-15 19:40:15 +00:00
Colin Cross
5cc53f240d Merge "Use libchrome as a shared library" am: a93ec546aa am: ab82d57384
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1524519

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib1aeba0ad98c61de8e00781f4cf84e45a0b403d4
2020-12-15 19:03:09 +00:00
Treehugger Robot
2d50616415 Merge "init: don't generate tombstones for expected test failures" am: 0b8d2fef69 am: 2a90da3ea8
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1529980

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I96debd5144ce163cdab07a7018208858e17658f4
2020-12-15 19:02:55 +00:00
Colin Cross
ab82d57384 Merge "Use libchrome as a shared library" am: a93ec546aa
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1524519

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If9d50135997ff6b69b4cd456987c8786a890264e
2020-12-15 18:51:54 +00:00
Treehugger Robot
2a90da3ea8 Merge "init: don't generate tombstones for expected test failures" am: 0b8d2fef69
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1529980

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3768f2b74e0fd943636f599a15dd919c9a768178
2020-12-15 18:48:18 +00:00
Colin Cross
a93ec546aa Merge "Use libchrome as a shared library" 2020-12-15 18:40:55 +00:00
Treehugger Robot
0b8d2fef69 Merge "init: don't generate tombstones for expected test failures" 2020-12-15 18:22:09 +00:00
Nikita Ioffe
3f473c9dfb Merge "Log start of the test to logcat" am: 356b184468 am: e7f989d826
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1526419

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If31b80253977f61e0cee5edf5ca9cdff4e73aa71
2020-12-15 16:15:59 +00:00
Nikita Ioffe
e7f989d826 Merge "Log start of the test to logcat" am: 356b184468
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1526419

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2fca5dbcd4b5c195d1a91576fcac2fda641985cf
2020-12-15 15:58:00 +00:00
Tom Cherry
94b1c57d93 init: don't generate tombstones for expected test failures
The firmware_handler.HandleAbort and subcontext.RecoverAfterAbort
tests intentionally abort in the child process to ensure that
ueventd/init can recover if their child processes die.  This generates
a tombstone which causes confusion.  This change resets SIGABRT to
SIG_DFL right before the abort(), so that the child processes will
exit normally without generating a tombstone or writing a crash to
logcat.

Bug: 169771958
Bug: 175383788
Test: run the above tests and verify no stack traces are printed to
      logcat and no tombstones are generated.
Change-Id: Ica09548d1c7a766bf5d9ff2e26c9fd558e85c7c1
2020-12-15 06:38:55 -08:00
Nikita Ioffe
356b184468 Merge "Log start of the test to logcat" 2020-12-15 12:21:46 +00:00
Treehugger Robot
24c3197b78 Merge changes from topic "dma-buf-heap-system-uncached" am: 5fa4d4cc44 am: 580bacae0c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1525525

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic4e04cba24d481874c9e0f15f4461949202de615
2020-12-15 06:45:33 +00:00
John Stultz
03fe1d48a4 ueventd.rc: Reduce permissions for /dev/dma_heap/system to 444 am: dc01a02a1a am: 80f6462d7e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1528458

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1c11edca1d7cd3b4f5c29ce5a1b402aafdd408a6
2020-12-15 06:45:32 +00:00
Christopher Ferris
6ddc2c56c9 Update for v5.10 kernel headers.
Test: Builds.
Change-Id: I6c4b04751df026ef7cbb91627174188c5e6d137c
2020-12-14 22:36:37 -08:00
Treehugger Robot
580bacae0c Merge changes from topic "dma-buf-heap-system-uncached" am: 5fa4d4cc44
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1525525

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icccfc6d36a9b32e7d32822285c39cdb4300329f4
2020-12-15 06:27:53 +00:00
John Stultz
80f6462d7e ueventd.rc: Reduce permissions for /dev/dma_heap/system to 444 am: dc01a02a1a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1528458

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I56eae2ade03ae1f508b828562822b0fcdcf3ed2b
2020-12-15 06:27:40 +00:00
Treehugger Robot
5fa4d4cc44 Merge changes from topic "dma-buf-heap-system-uncached"
* changes:
  ueventd.rc: Add /dev/dma_heap/system-uncached permissions
  ueventd.rc: Reduce permissions for /dev/dma_heap/system to 444
2020-12-15 06:16:50 +00:00
Stephen Crane
e962930d19 trusty: Retrieve coverage PCs from coverage record
Adds the ability to retrieve and save program counter information from
the trusty coverage record data. PC information is saved to a .sancov
file, parseable by the LLVM sancov tool. Sancov can then symbolize and
display this coverage information for consumption by humans.

Adds a sancov dump to the libtrusty_coverage_test for testing.

Bug: 175221942
Test: atest libtrusty_coverage_test
Test: Retrieve sancov file and manually symbolize with sancov
Change-Id: I342ea2ca9abb87986b2904ff69415544ee6070fc
2020-12-14 22:06:13 -08:00
Treehugger Robot
2c4e184eaa Merge "libsnapshot: Remove misleading message" am: f101219263 am: a7598ac179
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1529158

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I84a50b16a0d8a6cb9913843cd26d4bfc497d6726
2020-12-15 05:18:09 +00:00
Treehugger Robot
a7598ac179 Merge "libsnapshot: Remove misleading message" am: f101219263
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1529158

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie06b88963f21b2544b0717e93377f725764dab69
2020-12-15 05:01:55 +00:00
Treehugger Robot
f101219263 Merge "libsnapshot: Remove misleading message" 2020-12-15 04:47:25 +00:00
Treehugger Robot
2b71ec715a Merge "Update message versionioning system" am: 00ed8bdddb am: 438b5d0317
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1526877

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id10765be78869b71ed0cab74f1d4b59582f01a54
2020-12-15 02:16:53 +00:00
Treehugger Robot
438b5d0317 Merge "Update message versionioning system" am: 00ed8bdddb
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1526877

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I16a5f9d80cebbcce1427a5c354df9f6903ffa52b
2020-12-15 02:01:32 +00:00
Treehugger Robot
00ed8bdddb Merge "Update message versionioning system" 2020-12-15 01:25:12 +00:00
Daniel Rosenberg
28b73f8472 libsnapshot: Remove misleading message
If we read up to a label, this error message is unneeded, and if we
don't, we already return an error message before this, leaving the old
message as entirely redundant and misleading.

Test: Run, verify "No COW Footer, recovered data" does not show in logs
Bug: 172026020
Change-Id: I31d054ccf898cf93c71ff201f0868e57cd1a6135
2020-12-14 17:12:07 -08:00
John Stultz
efb6e07e0a ueventd.rc: Add /dev/dma_heap/system-uncached permissions
Add permissions for dev/dma_heap/system-uncached dmabuf heap.

This should match the dmabuf system heap.

Signed-off-by: John Stultz <john.stultz@linaro.org>
Change-Id: I9253d56c72d45e228539f709e76ba0862ae03d96
2020-12-14 23:29:55 +00:00
John Stultz
dc01a02a1a ueventd.rc: Reduce permissions for /dev/dma_heap/system to 444
Jeffrey Vander Stoep noted the permissions for the system dmabuf
heap should be 444 instead of 666, as we only need to open and
call ioctl on the device.

Signed-off-by: John Stultz <john.stultz@linaro.org>
Change-Id: I650c9fabfffd1eac5f59bbc7fa1e0ae1f5646bd9
2020-12-14 23:29:35 +00:00
Tri Vo
069430b667 Merge "trusty: fuzz: Link libtrusty_test statically" am: 5a611cb834 am: 0698e29464
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1526978

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5a3d04353eb264ed4a280cf994302deba1387b76
2020-12-14 22:52:06 +00:00
Tri Vo
0698e29464 Merge "trusty: fuzz: Link libtrusty_test statically" am: 5a611cb834
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1526978

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ida7f67d7a41c568cd5836dcb4657aa676b040aee
2020-12-14 22:28:17 +00:00
Tri Vo
5a611cb834 Merge "trusty: fuzz: Link libtrusty_test statically" 2020-12-14 20:39:09 +00:00