Treehugger Robot
d41a75a5f0
Merge "Make mkbootfs self-contained" am: 4f8a56f15d am: 14f3b1b0d2 am: 434735eab7
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1690535
Change-Id: I6bbf10d4d326d069f8e311ade2b487e7c66bc201
2021-05-03 18:03:59 +00:00
Treehugger Robot
434735eab7
Merge "Make mkbootfs self-contained" am: 4f8a56f15d am: 14f3b1b0d2
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1690535
Change-Id: I8c679e880ecea0539d84bd2a0cd4dd09fcc8fbb8
2021-05-03 17:39:48 +00:00
Treehugger Robot
14f3b1b0d2
Merge "Make mkbootfs self-contained" am: 4f8a56f15d
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1690535
Change-Id: If2264860a48b2c5e240808eccace000a30689952
2021-05-03 17:18:57 +00:00
Treehugger Robot
4f8a56f15d
Merge "Make mkbootfs self-contained"
2021-05-03 16:58:55 +00:00
Yi-Yo Chiang
288f9eec0f
Make mkbootfs self-contained
...
Now that mkbootfs is in prebuilt build tools, make it have no dynamic
dependency so that the binary is portable.
Bug: 184490452
Test: Presubmit
Change-Id: Ida4ee9af3c51ba9d163cf9c1e7b7098fd24e0de1
2021-05-02 19:36:23 +08:00
Treehugger Robot
8f4082617e
Merge "filesystem_config: Add a aid/uid for UWB subsystem" am: 2de90ca526 am: a6528dee6e am: 000f1c0fd3
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1690654
Change-Id: Ia2c811c60616eb1033fc44e5e1a431b04b86998c
2021-04-30 20:10:17 +00:00
Treehugger Robot
000f1c0fd3
Merge "filesystem_config: Add a aid/uid for UWB subsystem" am: 2de90ca526 am: a6528dee6e
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1690654
Change-Id: I14327ad6b7d91e3e899f5bd7470539eed5247b11
2021-04-30 19:40:15 +00:00
Treehugger Robot
a6528dee6e
Merge "filesystem_config: Add a aid/uid for UWB subsystem" am: 2de90ca526
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1690654
Change-Id: I250b410112c97ad4f2e1023b85a6a5c8f6a5c0c5
2021-04-30 19:22:48 +00:00
Akilesh Kailash
b913e9d261
Merge "libsnapshot: Add Version field which will be used by update-engine manifest" am: 0ec13ceda9 am: a728724a34 am: 0bfd808995
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1676194
Change-Id: Iddee4f742bc6dfb8c7e07b0d5697360f5404d4fa
2021-04-30 19:08:03 +00:00
Treehugger Robot
2de90ca526
Merge "filesystem_config: Add a aid/uid for UWB subsystem"
2021-04-30 19:04:57 +00:00
Akilesh Kailash
0bfd808995
Merge "libsnapshot: Add Version field which will be used by update-engine manifest" am: 0ec13ceda9 am: a728724a34
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1676194
Change-Id: I7411a1b89bb3efe4c069f6e5b039c449252f0644
2021-04-30 18:50:57 +00:00
Akilesh Kailash
a728724a34
Merge "libsnapshot: Add Version field which will be used by update-engine manifest" am: 0ec13ceda9
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1676194
Change-Id: Iec662bd6a12d8be199fe15ffb0511309110e0945
2021-04-30 18:26:15 +00:00
Akilesh Kailash
0ec13ceda9
Merge "libsnapshot: Add Version field which will be used by update-engine manifest"
2021-04-30 18:08:54 +00:00
Akilesh Kailash
acc1c5d189
libsnapshot: Add Version field which will be used by update-engine
...
manifest
Bug: 183863613
Test: Build
Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: If4b6a60669a55eb2ea1167fb2cc49ce04c054748
2021-04-30 06:31:01 +00:00
Daniel Rosenberg
4a0ecf9c1f
Merge "libsnapshot: Allow inspect_cow to show failed blocks" am: 82129fd4ce am: 2377825899 am: 1a24b1fcde
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1673894
Change-Id: If01dc84ebe5bab56b8e436832bd6a13e1b93a559
2021-04-30 06:21:51 +00:00
Daniel Rosenberg
1a24b1fcde
Merge "libsnapshot: Allow inspect_cow to show failed blocks" am: 82129fd4ce am: 2377825899
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1673894
Change-Id: I0950b60a2206f192d2816e47129987b27c16b52c
2021-04-30 06:05:16 +00:00
Daniel Rosenberg
2377825899
Merge "libsnapshot: Allow inspect_cow to show failed blocks" am: 82129fd4ce
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1673894
Change-Id: I13fb8346d1526f274a840a94ccd7af773430577c
2021-04-30 05:47:26 +00:00
Daniel Rosenberg
82129fd4ce
Merge "libsnapshot: Allow inspect_cow to show failed blocks"
2021-04-30 05:31:51 +00:00
Inseob Kim
43f3a6b92c
Merge "Fix precompiled sepolicy logic" am: 4664bbc6c7 am: ff9de56e37 am: 257a50e59d
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1690527
Change-Id: I359d9a1ea580a79d10f06825ee0a9c554f996c7b
2021-04-30 03:06:34 +00:00
Inseob Kim
257a50e59d
Merge "Fix precompiled sepolicy logic" am: 4664bbc6c7 am: ff9de56e37
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1690527
Change-Id: Ie8c7fe471d068414c1951fc1dc0ce90c0aa1db1e
2021-04-30 02:38:53 +00:00
Inseob Kim
ff9de56e37
Merge "Fix precompiled sepolicy logic" am: 4664bbc6c7
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1690527
Change-Id: I095b5009b7a0ff346c5f28b2e9ad2e37efcae178
2021-04-30 01:50:04 +00:00
Inseob Kim
4664bbc6c7
Merge "Fix precompiled sepolicy logic"
2021-04-30 01:14:15 +00:00
Daniel Rosenberg
05a73c5788
libsnapshot: Allow inspect_cow to show failed blocks
...
Adds the -b option to show the bad data block that failed to decompress.
If the block is large enough, display the front as though it were a
CowOperation, as this is the most likely culprit.
Change-Id: I287f13e0794a1ca9d647d4b1099ab238a6202b23
Bug: 183985866
Test: inspect_cow -db <COW_FILE>
2021-04-29 21:58:58 +00:00
Roshan Pius
e85201bbeb
filesystem_config: Add a aid/uid for UWB subsystem
...
Bug: 186788640
Test: Compiles
Change-Id: Ib3d1b064e8e68e7b9e59b26f356ac7c4da2eaaf8
2021-04-29 14:57:07 -07:00
Eric Biggers
fe1ac4d845
Merge "init.rc: fix (re)starting apexd on FDE devices" am: 4bb41c0ee4 am: b8cadd770f am: 294fa94e7a
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1684057
Change-Id: Icd5e30b879c49116571e058d52eb517fd07f77f9
2021-04-29 21:37:08 +00:00
Eric Biggers
294fa94e7a
Merge "init.rc: fix (re)starting apexd on FDE devices" am: 4bb41c0ee4 am: b8cadd770f
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1684057
Change-Id: I85c2662682b4e8c9ecefe509b0ef0647b56cfb49
2021-04-29 21:19:56 +00:00
Eric Biggers
b8cadd770f
Merge "init.rc: fix (re)starting apexd on FDE devices" am: 4bb41c0ee4
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1684057
Change-Id: I71ae39d715aa2b56dd77b03ea19c3aa9584dfdfa
2021-04-29 20:51:54 +00:00
Eric Biggers
4bb41c0ee4
Merge "init.rc: fix (re)starting apexd on FDE devices"
2021-04-29 20:20:42 +00:00
Eric Biggers
915b8d7194
init.rc: fix (re)starting apexd on FDE devices
...
On first boot, FDE devices hang on the command
'wait_for_prop apexd.status activated'. This is because apexd was
already started with the tmpfs /data, then was stopped by
vold.decrypt=trigger_shutdown_framework. Then when apexd is started
again with the real /data, it sees that apexd.status="ready" already, so
it doesn't consider itself to be starting from scratch again. So it
doesn't move apexd.status back to "activated" as expected.
Fix the above by resetting apexd.status to its initial value of the
empty string before trying to start apexd in the post-fs-data trigger.
Note that this also takes care of the userspace reboot case which was
previously handled in the userspace-reboot-requested trigger.
Also, FDE devices hang at the same place on non-first boots with default
encryption (i.e., when no PIN is set) because apexd is still running
after having been started with the tmpfs /data. This is because
vold.decrypt=trigger_shutdown_framework isn't run in that case, but
rather vold manually kills processes that have open files on /data --
which doesn't include apexd. But, apexd should be restarted too.
Fix that by using 'restart apexd' rather than 'start apexd'.
Note that these changes are needed even though FDE devices don't support
updatable APEXes, as apexd is needed regardless.
This is one of a set of changes that is needed to get FDE working again
so that devices that launched with FDE can be upgraded to Android 12.
Bug: 186165644
Test: Tested FDE on Cuttlefish. Also tested userspace reboot (with FBE)
Change-Id: I4fa57cf15d77b64d1167eaf966347d2a9d6a9b72
2021-04-29 17:05:37 +00:00
Inseob Kim
28fdb6794c
Fix precompiled sepolicy logic
...
If precompiled vendor policy has system_ext hash, system_ext also has to
have its hash, to use precompiled sepolicy.
Bug: 186727553
Test: remove system_ext's hash and see sepolicy compiled in runtime
Change-Id: I4af3418d614156b5e9cd0b0116c2814ba994ee81
2021-04-29 19:50:38 +09:00
Yo Chiang
bc66d66554
Merge "Enable disabled CtsFsMgrTestCases test cases" am: e222fa4d74 am: 16d0600eb5 am: a6d8940f08
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1687910
Change-Id: I17e55db283369c420febc83283896932f0320156
2021-04-29 07:23:04 +00:00
Yo Chiang
a6d8940f08
Merge "Enable disabled CtsFsMgrTestCases test cases" am: e222fa4d74 am: 16d0600eb5
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1687910
Change-Id: I6b7561e23de1beb7f6222b5810cde67e22a02d21
2021-04-29 07:06:49 +00:00
Yo Chiang
16d0600eb5
Merge "Enable disabled CtsFsMgrTestCases test cases" am: e222fa4d74
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1687910
Change-Id: Ibc2ee8f1631c3a735a15ec437ff6d2a695c59956
2021-04-29 06:51:45 +00:00
Yo Chiang
e222fa4d74
Merge "Enable disabled CtsFsMgrTestCases test cases"
2021-04-29 06:37:59 +00:00
Treehugger Robot
277178c2c5
Merge "Allow a kernel bootconfig to set the qemu key" am: 6cbc7e01b2 am: 0d13e9370c am: 57f01c51e5
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1690216
Change-Id: Ia251f2c3fc296783b001d1584f34370e4b73aea6
2021-04-29 04:23:34 +00:00
Treehugger Robot
57f01c51e5
Merge "Allow a kernel bootconfig to set the qemu key" am: 6cbc7e01b2 am: 0d13e9370c
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1690216
Change-Id: I9a665f6d6bc7e1ffc90ca3875c0a1906897511d1
2021-04-29 04:07:10 +00:00
Treehugger Robot
0d13e9370c
Merge "Allow a kernel bootconfig to set the qemu key" am: 6cbc7e01b2
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1690216
Change-Id: I83f046c6ff77229ba6508496f589b8b914a2767b
2021-04-29 03:35:21 +00:00
Treehugger Robot
6cbc7e01b2
Merge "Allow a kernel bootconfig to set the qemu key"
2021-04-29 02:16:33 +00:00
Roman Kiryanov
6e20ff83ac
Allow a kernel bootconfig to set the qemu key
...
The existing code has a lot of references to the
`ro.boot.qemu` and `ro.boot.qemu.something` properties
which is not supported by the bootconfig if we place
everything under `androidboot.qemu`.
Bug: 182291166
Test: getprop | grep qemu
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: Icb9d29c8dc39e1fa52a6f2ce43b4f42182b7995d
2021-04-28 15:31:52 -07:00
Akilesh Kailash
aab36cb5a1
Merge "libsnapshot: Pass MSG_NOSIGNAL socket flags" am: d79e4f4c19 am: e22825a7d2 am: b7947de541
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1687665
Change-Id: I9934a5fb5af02df13f16afffcfc211c634e9078d
2021-04-28 22:12:41 +00:00
Steven Moreland
02ede6f998
Merge "libutils: sharedbuffer test - expect greatness!" am: 9dd80b6b04 am: 246739cc61 am: 161d760f31
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1688812
Change-Id: Id6ec8ae3f744c1936faebdd66bb2f32b2e6cf814
2021-04-28 22:12:28 +00:00
Akilesh Kailash
b7947de541
Merge "libsnapshot: Pass MSG_NOSIGNAL socket flags" am: d79e4f4c19 am: e22825a7d2
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1687665
Change-Id: I621af5594d4c8b0b975b1662fb08cf23e4e774fa
2021-04-28 21:55:57 +00:00
Steven Moreland
161d760f31
Merge "libutils: sharedbuffer test - expect greatness!" am: 9dd80b6b04 am: 246739cc61
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1688812
Change-Id: I9f3ceca0b1335c4aa433e767343efb721fa85186
2021-04-28 21:55:51 +00:00
Akilesh Kailash
e22825a7d2
Merge "libsnapshot: Pass MSG_NOSIGNAL socket flags" am: d79e4f4c19
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1687665
Change-Id: Ic376ab3efc587e65a41ae61bace30c75d9e35042
2021-04-28 21:24:24 +00:00
Steven Moreland
246739cc61
Merge "libutils: sharedbuffer test - expect greatness!" am: 9dd80b6b04
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1688812
Change-Id: Id8d62f4aca69d9519a303e00a89c33a791028d5f
2021-04-28 21:21:12 +00:00
Akilesh Kailash
d79e4f4c19
Merge "libsnapshot: Pass MSG_NOSIGNAL socket flags"
2021-04-28 20:55:34 +00:00
Steven Moreland
9dd80b6b04
Merge "libutils: sharedbuffer test - expect greatness!"
2021-04-28 20:28:09 +00:00
David Anderson
599317a445
Merge "libsnapshot: Add a merge failure code to SnapshotMergeReport." am: d5349dcf6d am: 94b0b7ac4b am: 710560b721
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1676193
Change-Id: Id5a06c3b351914510774e0f07ed099b0c6b92027
2021-04-28 20:27:56 +00:00
Christian Wailes
d494159f13
Merge "Added ARTD user" am: 8ef7d82213 am: dc76ce73cf am: 4607566356
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1664781
Change-Id: I19291956103c19d33ab8affaafbf6ca69b67c114
2021-04-28 20:23:52 +00:00
David Anderson
710560b721
Merge "libsnapshot: Add a merge failure code to SnapshotMergeReport." am: d5349dcf6d am: 94b0b7ac4b
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1676193
Change-Id: I150fdbd5c30ba1e51a7bf26551dfd5be6575bab6
2021-04-28 20:11:46 +00:00