Commit graph

67605 commits

Author SHA1 Message Date
Treehugger Robot
ea53ac7ea9 Merge "Specify version for aidl_interface explicitly" am: ceadc2332b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1560588

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I31005ee20320e612580a6c99146cdc015c470aba
2021-02-02 00:44:38 +00:00
Treehugger Robot
ceadc2332b Merge "Specify version for aidl_interface explicitly" 2021-02-02 00:08:08 +00:00
Mitch Phillips
244a9df3d7 Merge "[MemInit] Remove process_disable_memory_mitigations" am: 701dfe7469
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1553888

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I93f30b198a483c6467f33adf046b5f885b4f382d
2021-02-02 00:04:59 +00:00
Evgenii Stepanov
5b488224c4 Merge "Scale timeouts in debuggerd and llkd." am: 44274d17a0
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1566538

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ida4eeb124021e4377160c5e8909fbe023e2cc645
2021-02-02 00:01:07 +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
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
6a7d8fa937 Merge "Fix Keystore 2.0 related bug in gatekeeperd." am: b44cf2d71b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1566760

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib7ab52045ed5381b309b331daaa0a9f7a522e2df
2021-02-01 04:52:34 +00:00
Treehugger Robot
b44cf2d71b Merge "Fix Keystore 2.0 related bug in gatekeeperd." 2021-02-01 04:31:05 +00:00
Marco Nelissen
4acdebc22d Merge "Send DeleteUsers/DeleteAllUsers to Trusty" am: 003bf066b2
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1558920

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If4823b354ae8bd51cea32e2aecc22da617c37ad7
2021-01-30 23:18:59 +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
7472ac1537 Merge "Remove ART APEX from the bootstrap apexes" am: dfab416188
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1563459

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I24dfbd6280222b86dd3dd916128e4ca51028bfb7
2021-01-30 03:59:21 +00:00
Treehugger Robot
dfab416188 Merge "Remove ART APEX from the bootstrap apexes" 2021-01-30 03:14:03 +00:00
Treehugger Robot
349ef2e51b Merge "Add attestation key to generate/import messages" am: bd90bfabb2
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1564093

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibbee9a9746f0a8c36629536944c56e20c4b654ce
2021-01-30 00:32:06 +00:00
Darryl Johnson
5c9a8b3991 Merge "Revert "trusty: Android part of dynamic app loader"" am: 95d9a56964
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1566799

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaf7bcd80b6fdce450399c30139f8bf9bcd14555f
2021-01-30 00:28:34 +00:00
Arve Hjønnevåg
352ef8e679 Merge "trusty: Android part of dynamic app loader" am: c881412932
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1516552

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5886c41798218a1492dabbe7bc2475cc474286fa
2021-01-30 00:06:35 +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-Valentin Onea
f48e941462 Merge "Create appcompat data dir" am: 2e2861dbd3
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1535012

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5b71f1158d306fb9a5111c27c334c1d157fd7d0e
2021-01-29 21:49:43 +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
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
2bf5904576 Merge changes from topic "tombstone_proto_electric_boogaloo" am: 00fd36cdef
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1560742

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If78b16c701d65851e686c6ac46f2b5da0dffda9c
2021-01-28 22:34:54 +00:00
Josh Gao
a9c57c028e Reland protobuf tombstones. am: 76e1e30f16
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1560741

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7fd5c3974baa362bd6cd123d616784ee95568cb9
2021-01-28 22:34:41 +00: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
f2a0ea92e3 Merge "libprocessgroup: Add control of printing log in WriteFileAction" am: feefc674eb
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1556723

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id6bfffc5932e6a0d82d9336c9b3f81ff90f0d189
2021-01-28 05:19:15 +00:00
Rick Yiu
feefc674eb Merge "libprocessgroup: Add control of printing log in WriteFileAction" 2021-01-28 04:36:39 +00:00
Tianjie Xu
161e4a8e24 Merge "Set hashtree algorithm for verity partitions" am: b9c7459fba
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1553475

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibcbc292042177b71ac5fec78993a8f20be19d194
2021-01-28 03:46:57 +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
b3d4c48b42 Merge "Ensure compile first to make avbtool work" am: 2e5d7d9fea
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1562855

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib42c80bc2a8701a3af5f9cbdf08003707c2c66da
2021-01-27 23:48:20 +00:00
Julien Desprez
2e5d7d9fea Merge "Ensure compile first to make avbtool work" 2021-01-27 23:47:47 +00:00
Treehugger Robot
bbd85b9f37 Merge "Revert "Revert "libprocessgroup: move freezer to uid/pid hierarchy""" am: d9e7410e65
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1560178

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If6bc86f3580e586a14bbe26b310c5f3eff1e4b94
2021-01-27 23:33:59 +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
3d0f3cacba Merge "Remove salyzyn@ from OWNERS." am: 3dadf4ed80
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1559349

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifd8669f8d39fca9d0de4edca9dd74706629f3721
2021-01-27 18:28:22 +00:00
David Anderson
b1fc9f81ae Merge "libsnapshot: Add a test for when partitions shrink and grow simultaneously." am: 4fdf57024c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1554775

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5b235712713bc46670c68d820441da175fb4f4b8
2021-01-27 18:27:54 +00: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
ac736fe80a Merge "Revert^2 "libprocessgroup: uid/pid hierarchy for cgroup v2"" am: 38eaa32494
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1560699

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1f3356c8eb42abe3d71bdb3134fb98cbbdc636af
2021-01-27 17:08: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
5850f8efd6 Merge "ueventd: deprecate paths without /etc/" am: 587f5e922c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1526382

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibe9c6c124c84683240982210ba04804d9e7b3f06
2021-01-27 00:48:53 +00:00