Commit graph

67497 commits

Author SHA1 Message Date
Elliott Hughes
89ea3fe5ac Update NOTICE.
This was horrifically out of date... This NOTICE file covered a bunch of
third-party code that isn't in system/core/ (and some of which isn't in
the system at all any more).

Test: N/A
Change-Id: Ia564321b71c3993706b336604f983ae4e0964704
2021-02-04 10:10:17 -08:00
Treehugger Robot
3ce24b87a2 Merge "Remove invalid error message in the merge path." 2021-02-03 21:51:30 +00:00
Peter Collingbourne
d7f815eb04 Merge "Fix CrasherTest.smoke in debuggerd_test." 2021-02-03 19:20:10 +00:00
Akilesh Kailash
392dbeeb07 Remove invalid error message in the merge path.
Bug: 167409187
Test: Compile snapuserd
Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: I7a494627b001cb5be20ac6b1bbded64574c3cec0
2021-02-03 18:39:01 +00:00
Treehugger Robot
9e082d4952 Merge "fs_mgr: Harden adb-remount-test.sh on read-only filesystem" 2021-02-03 08:04:00 +00:00
Peter Collingbourne
939d074236 Fix CrasherTest.smoke in debuggerd_test.
Now that we default to sync MTE in tests, the default tagged_addr_ctrl
in this test needs to be updated.

Bug: 135772972
Change-Id: I9bf6fb29df9799d1ed8c0d8b66f4d2891f487d80
2021-02-02 19:00:48 -08:00
Arve Hjønnevåg
7b204ac4ca Merge "trusty: Android part of dynamic app loader" 2021-02-02 01:39:56 +00:00
Bart Sears
6ba9afd1e9 Merge "Revert "Remove ART APEX from the bootstrap apexes"" 2021-02-02 01:11:38 +00:00
Treehugger Robot
ceadc2332b Merge "Specify version for aidl_interface explicitly" 2021-02-02 00:08:08 +00:00
Mitch Phillips
701dfe7469 Merge "[MemInit] Remove process_disable_memory_mitigations" 2021-02-01 23:32:24 +00:00
Evgenii Stepanov
44274d17a0 Merge "Scale timeouts in debuggerd and llkd." 2021-02-01 23:25:10 +00:00
chapin
6d869dd6ab Revert "Remove ART APEX from the bootstrap apexes"
Revert submission 1563392-remove_art_from_bootstrap

Reason for revert: Bug: 179002105
Reverted Changes:
I65e2a2089:Remove ART APEX from the bootstrap apexes
Ic20df80e2:Remove ART APEX from the bootstrap apexes

Change-Id: I474ab95805c5ca28e0bba91f3d226e8db5a7a9ea
2021-02-01 22:29:59 +00:00
Andrei Homescu
08d66c5036 trusty: Android part of dynamic app loader
Implement the Android tool that uploads Trusty application package files
to the Trusty app loader.

Bug: 115420908
Test: trusty_apploader boot-start-srv.app
Change-Id: Ie21b8cad749fd565579483944a8b71e861d3a51a
2021-02-01 14:00:35 -08:00
Evgenii Stepanov
2a55e1adbe Scale timeouts in debuggerd and llkd.
Respect ro.timeout_multiplier property. Some of these are required for
tombstone writing to work on MTE QEMU, the rest are done speculatively.

Test: add crashing code to system_server, observe the tombstone
Bug: 178231152
Change-Id: Ic86e494af571301df7af07d13a6c046a0da6bda7
2021-02-01 20:00:53 +00:00
Treehugger Robot
b44cf2d71b Merge "Fix Keystore 2.0 related bug in gatekeeperd." 2021-02-01 04:31:05 +00:00
Marco Nelissen
003bf066b2 Merge "Send DeleteUsers/DeleteAllUsers to Trusty" 2021-01-30 22:55:43 +00:00
Janis Danisevskis
0357239d2f Fix Keystore 2.0 related bug in gatekeeperd.
Test: atest android.keystore.cts.CipherTest#testEmptyPlaintextEncryptsAndDecryptsWhenUnlockedRequired
Change-Id: Iec3d8aa34db040d5d4a418307020019ca32b0ffb
2021-01-29 23:47:18 -08:00
Treehugger Robot
dfab416188 Merge "Remove ART APEX from the bootstrap apexes" 2021-01-30 03:14:03 +00:00
Treehugger Robot
bd90bfabb2 Merge "Add attestation key to generate/import messages" 2021-01-30 00:05:40 +00:00
Darryl Johnson
95d9a56964 Merge "Revert "trusty: Android part of dynamic app loader"" 2021-01-29 23:59:26 +00:00
Darryl Johnson
581c007537 Revert "trusty: Android part of dynamic app loader"
This reverts commit 9afa97b747.

Reason for revert: Causing build failures (b/178860531)

Change-Id: I41f515dfb55825da955d2a7ca0935d7a3de68910
2021-01-29 23:52:39 +00:00
Arve Hjønnevåg
c881412932 Merge "trusty: Android part of dynamic app loader" 2021-01-29 22:45:23 +00:00
Andrei Homescu
9afa97b747 trusty: Android part of dynamic app loader
Implement the Android tool that uploads Trusty application package files
to the Trusty app loader.

Bug: 115420908
Test: trusty_apploader boot-start-srv.app
Change-Id: Ia2dd0a5ab2138e0d81755169e6aeefa685a524c9
2021-01-29 10:00:02 -08:00
Andrei-Valentin Onea
2e2861dbd3 Merge "Create appcompat data dir" 2021-01-29 14:53:27 +00:00
Yo Chiang
41b6171741 fs_mgr: Harden adb-remount-test.sh on read-only filesystem
I'm getting this error:

  [  FAILED  ] /cache/overlay wipe

If /cache is not mounted, in which case it would be RO and empty, then
don't try to do `rm -rf /cache/overlay` as it would fail.
If /cache is RO and /cache/overlay doesn't exist, then `rm -f` would
fail, albeit the "-f" flag, this is a toybox bug.
Check file path existence before `rm`-ing so we don't trigger this error.

Change `ls <type> <path>` to `test <type> <path>` for robust checking.

Bug: 178683776
Bug: 165925766
Bug: 178771232
Test: adb-remount-test.sh on GSI + Pixel
Change-Id: Ie95de690d96146892127ab11a461d80cb6cb56fa
2021-01-29 14:12:43 +00:00
Jiyong Park
b99c12ef10 Remove ART APEX from the bootstrap apexes
Test: forrest
Bug: 169779935
Change-Id: I65e2a2089fa12674f3abbbe2f154eeec984dd5df
2021-01-29 12:08:31 +09:00
Josh Gao
00fd36cdef Merge changes from topic "tombstone_proto_electric_boogaloo"
* changes:
  Remove use of libbase logging in libdebuggerd.
  Reland protobuf tombstones.
2021-01-28 21:15:29 +00:00
Shawn Willden
657f71cd26 Add attestation key to generate/import messages
Bug: 171845787
Test: Build
Change-Id: I59bd25dc8998668f0ea2053f3e647bf6cc58885a
2021-01-28 11:56:14 -07:00
Rick Yiu
feefc674eb Merge "libprocessgroup: Add control of printing log in WriteFileAction" 2021-01-28 04:36:39 +00:00
Rick Yiu
d76053a4c5 libprocessgroup: Add control of printing log in WriteFileAction
If there are known fail pattern, we could disable printing logs to
reduce log spam. Use "LogFailures": true or "LogFailures": false.
Default will be true if not specified.

Bug: 178070122
Test: function works
Change-Id: Ia4081a10daf738294937f459f006fbcc3171481b
2021-01-28 03:26:18 +00:00
Tianjie Xu
b9c7459fba Merge "Set hashtree algorithm for verity partitions" 2021-01-28 03:03:21 +00:00
Josh Gao
618cea3ebd Remove use of libbase logging in libdebuggerd.
libbase logging uses getprogname() to get the default tag, which breaks
for the fallback handler which is statically linked into the dynamic
linker. Switch to libasync_safe for logging.

Test: atest -c CtsSeccompHostTestCases:android.seccomp.cts.SeccompHostJUnit4DeviceTest#testAppZygoteSyscalls
Change-Id: Ieeaf33fb26cff4ba7e1589d1d883ac2fcc74cf47
2021-01-27 15:52:43 -08:00
Julien Desprez
2e5d7d9fea Merge "Ensure compile first to make avbtool work" 2021-01-27 23:47:47 +00:00
Treehugger Robot
d9e7410e65 Merge "Revert "Revert "libprocessgroup: move freezer to uid/pid hierarchy""" 2021-01-27 22:49:32 +00:00
Julien Desprez
1d72b4f363 Ensure compile first to make avbtool work
Test: make host-unit-tests
Bug: 178591423
Change-Id: Ibac59430a1dff69117b16c44787c177501825986
2021-01-27 14:06:50 -08:00
David Anderson
3dadf4ed80 Merge "Remove salyzyn@ from OWNERS." 2021-01-27 17:27:47 +00:00
David Anderson
4fdf57024c Merge "libsnapshot: Add a test for when partitions shrink and grow simultaneously." 2021-01-27 17:27:19 +00:00
Marco Ballesio
7707909ba2 Revert "Revert "libprocessgroup: move freezer to uid/pid hierarchy""
This reverts commit b01aa99408.

Reason for revert: blocking issue was resolved https://partner-android-review.googlesource.com/c/kernel/private/gs-google/+/1846507

Change-Id: If125fe9af53e2b519955f021208d5d5530c6277e
2021-01-27 16:43:07 +00:00
Marco Ballesio
38eaa32494 Merge "Revert^2 "libprocessgroup: uid/pid hierarchy for cgroup v2"" 2021-01-27 16:40:02 +00:00
Marco Ballesio
a1a0497984 Revert^2 "libprocessgroup: uid/pid hierarchy for cgroup v2"
4bbabe4ca4

Change-Id: I6742ffd19a6ea1fe3bf6b4386da69f5885b13be4
2021-01-27 06:07:25 +00:00
Josh Gao
76e1e30f16 Reland protobuf tombstones.
This reverts the following commits:
    e156ede145.
    eda96eddcb.
    5ec54d1e84.
    1e45d3f223.
    a50f61f8fa.

Test: treehugger
Test: atest -c CtsSeccompHostTestCases:android.seccomp.cts.SeccompHostJUnit4DeviceTest#testAppZygoteSyscalls
Change-Id: Ic2b1f489ac9f1fec7d7a33c845c29891f4306bbd
2021-01-26 17:55:17 -08:00
Treehugger Robot
587f5e922c Merge "ueventd: deprecate paths without /etc/" 2021-01-26 23:53:54 +00:00
Treehugger Robot
e8cc75f059 Merge "Make second stage init visible to microdroid" 2021-01-26 23:47:46 +00:00
David Anderson
10b755f1d7 libsnapshot: Add a test for when partitions shrink and grow simultaneously.
Bug: 177935716
Test: vts_libsnapshot_test
Change-Id: Ie9415411b8450147d44c6e3b62f413c5aac993cc
2021-01-26 14:48:09 -08:00
Tom Cherry
71dd7064cc ueventd: deprecate paths without /etc/
ueventd.rc scripts belong in the /etc/ directory of their given
partition, not the root of the partition.  This can cause problems,
especially since Android.bp cannot write to the root directly, forcing
vendors to use Android.mk for these files.  Note that
/system/etc/ueventd.rc moved long ago.

Test: Tree-hugger
Change-Id: I2dcaafc3c3f687f76ab6bc38af979c8b43346db0
2021-01-26 12:26:09 -08:00
Treehugger Robot
f2d359cbaa Merge "Revert "first_stage_mount: Create snapshot devices before launching first_stage_console"" 2021-01-26 18:00:24 +00:00
Jerome Gaillard
96cb0fd9e5 Merge changes from topic "revert-1556807-tombstone_proto-NRGSMJBETL"
* changes:
  Revert "tombstoned: switch from goto to RAII."
  Revert "tombstoned: make it easier to add more types of outputs."
  Revert "tombstoned: support for protobuf fds."
  Revert "libdebuggerd: add protobuf implementation."
  Revert "Fix build breakage."
2021-01-26 16:49:53 +00:00
Jeongik Cha
d039f7bba7 Specify version for aidl_interface explicitly
Bug: 150578172
Test: m
Change-Id: I771c5d16c664d9e2e1602d7c5ac8035850bfe8ae
2021-01-26 22:35:08 +09:00
Jerome Gaillard
e156ede145 Revert "tombstoned: switch from goto to RAII."
Revert "Let crash_dump read /proc/$PID."

Revert submission 1556807-tombstone_proto

Reason for revert: b/178455196, Broken test: android.seccomp.cts.SeccompHostJUnit4DeviceTest#testAppZygoteSyscalls on git_master on cf_x86_64_phone-userdebug

Reverted Changes:
Ide6811297:tombstoned: switch from goto to RAII.
I8d285c4b4:tombstoned: make it easier to add more types of ou...
Id0f0fa285:tombstoned: support for protobuf fds.
I6be6082ab:Let crash_dump read /proc/$PID.
Id812ca390:Make protobuf vendor_ramdisk_available.
Ieeece6e6d:libdebuggerd: add protobuf implementation.

Change-Id: I8a77f6b9e1b42902ef7ee250cc3f1fd341ea0e2b
2021-01-26 12:42:09 +00:00
Jerome Gaillard
eda96eddcb Revert "tombstoned: make it easier to add more types of outputs."
Revert "Let crash_dump read /proc/$PID."

Revert submission 1556807-tombstone_proto

Reason for revert: b/178455196, Broken test: android.seccomp.cts.SeccompHostJUnit4DeviceTest#testAppZygoteSyscalls on git_master on cf_x86_64_phone-userdebug

Reverted Changes:
Ide6811297:tombstoned: switch from goto to RAII.
I8d285c4b4:tombstoned: make it easier to add more types of ou...
Id0f0fa285:tombstoned: support for protobuf fds.
I6be6082ab:Let crash_dump read /proc/$PID.
Id812ca390:Make protobuf vendor_ramdisk_available.
Ieeece6e6d:libdebuggerd: add protobuf implementation.

Change-Id: Ib2403c1b61f6cf0513b76361440fbc5909d7554a
2021-01-26 12:42:03 +00:00