Commit graph

68089 commits

Author SHA1 Message Date
Bart Sears
fb8c06ab94 Merge "Revert "Remove ART APEX from the bootstrap apexes"" am: 6ba9afd1e9 am: 15de287cfc
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1566910

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic4261c67c795e49cfbba1044b5a3d12d617956ae
2021-02-02 02:43:39 +00:00
Bart Sears
15de287cfc Merge "Revert "Remove ART APEX from the bootstrap apexes"" am: 6ba9afd1e9
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1566910

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie7d6da1e9a5778af2fd95a5f6c77869dd53abbc6
2021-02-02 01:45:36 +00:00
Bart Sears
6ba9afd1e9 Merge "Revert "Remove ART APEX from the bootstrap apexes"" 2021-02-02 01:11:38 +00:00
Treehugger Robot
d695e691ab Merge "Specify version for aidl_interface explicitly" am: ceadc2332b am: ea53ac7ea9
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1560588

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If78914b4620503b8be23e736bf315d0123f321f8
2021-02-02 00:54:27 +00:00
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
Mitch Phillips
c9696708d3 Merge "[MemInit] Remove process_disable_memory_mitigations" am: 701dfe7469 am: 244a9df3d7
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1553888

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I489ac7392f018d1e9327d7c0658ee803d3dfdaee
2021-02-01 05:15:50 +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
86da7ec85c Merge "Send DeleteUsers/DeleteAllUsers to Trusty" am: 003bf066b2 am: 4acdebc22d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1558920

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I23524bc7a2b30598cf096b1b52bf2606ecf03eca
2021-01-30 04:37:55 +00: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
a9fa115f23 Merge "Add attestation key to generate/import messages" am: bd90bfabb2 am: 349ef2e51b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1564093

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a4d3594bed0d207aa3121550a9a5ca80d1a1545
2021-01-28 23:02:15 +00:00
Josh Gao
78eb1a6402 Reland protobuf tombstones. am: 76e1e30f16 am: a9c57c028e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1560741

MUST ONLY BE SUBMITTED BY AUTOMERGER

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I89c092e1a7d790c840cb56ee0af57f9de58f0f96
2021-01-28 05:44:54 +00: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
33e1b08f0e Merge "Set hashtree algorithm for verity partitions" am: b9c7459fba am: 161e4a8e24
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1553475

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5ca90dacea5c14500cb95522369de3064efb9fbc
2021-01-28 04:09:51 +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