Commit graph

78491 commits

Author SHA1 Message Date
Treehugger Robot
2e13ea6fcd Merge "bootstat: remove unused FDE boot events" am: 6e74f8c4a6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2232787

Change-Id: Ibbdfe2b696bd2ae5ad2ec90878760c4ff7c798b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-03 19:25:15 +00:00
Treehugger Robot
6e74f8c4a6 Merge "bootstat: remove unused FDE boot events" 2022-10-03 18:46:56 +00:00
Florian Mayer
04378de425 Merge "[MTE] Add device config to control upgrade time" am: 84a30c8526
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2219633

Change-Id: If398225ba6f3499a4f0a4facd7cc0e566f704f71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-03 18:12:13 +00:00
Florian Mayer
84a30c8526 Merge "[MTE] Add device config to control upgrade time" 2022-10-03 17:47:12 +00:00
Treehugger Robot
9b5afb80dc Merge "simg_dump.py: fix error for CHUNK_TYPE_FILL" am: f2065c8890
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2238988

Change-Id: Ib533f310d008ed1014ef3699816463503ac52ef2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-03 16:32:40 +00:00
Treehugger Robot
f2065c8890 Merge "simg_dump.py: fix error for CHUNK_TYPE_FILL" 2022-10-03 15:51:33 +00:00
Bowgo Tsai
dbf62d939a simg_dump.py: fix error for CHUNK_TYPE_FILL
In python3, division of two integers produces a float,
which cannot be used to multiply a bytes sequence.

Using // to produce an integer quotient.

Bug: 245257511
Test: ./system/core/libsparse/simg_dump.py -sv path/to/image
Change-Id: Ibe95056409ac3676a68f5e7693331ca4a66e9fb7
2022-10-03 16:27:49 +08:00
Peter Collingbourne
df1a5bf61f Merge "Resync zygote64 and zygote64_32 rc files." am: 9f7a19d0f3
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2239035

Change-Id: I4d0a67c24048105bff89b0c6187914798d7cef1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-30 19:29:31 +00:00
Peter Collingbourne
9f7a19d0f3 Merge "Resync zygote64 and zygote64_32 rc files." 2022-09-30 18:56:35 +00:00
Krzysztof Kosiński
147d5e1a6a Merge "storaged: Fix deprecated usages of protobuf API." am: 27bccbfdef
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2231186

Change-Id: Ib60d7deb27a0a2b7a34ada73e98117cd1acb5d87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-30 00:59:45 +00:00
Krzysztof Kosiński
27bccbfdef Merge "storaged: Fix deprecated usages of protobuf API." 2022-09-30 00:31:19 +00:00
Peter Collingbourne
d77b91b4ba Resync zygote64 and zygote64_32 rc files.
I noticed that the zygote64 and zygote64_32 files
had gotten slightly out of sync as a result of change
I3aad4b4b1d2f54db9e7ba86db8a655d8552bad0a. Merge the zygote64_32 changes
into zygote64, and to prevent this from happening again, replace the
64-bit zygote declaration in zygote64_32 with an import from zygote64.

Change-Id: I7fcceeb22b722c2164b9acf0b517a32ce34731fd
2022-09-29 17:21:54 -07:00
Jiyong Park
1ded786966 Merge "Annotate symbols correctly" am: b2d8315f10
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2229031

Change-Id: I757613c400b27519c5c8453f46138c2065dcf257
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 01:59:46 +00:00
Jiyong Park
b2d8315f10 Merge "Annotate symbols correctly" 2022-09-28 01:22:45 +00:00
Akilesh Kailash
2349099be4 Merge "snapuserd: Set taskprofile OtaProfiles" am: 33081c0f90
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2233549

Change-Id: Iebf89f9f5d104e78d9da85b89f0dfcc654b6e6ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-27 20:01:49 +00:00
Akilesh Kailash
33081c0f90 Merge "snapuserd: Set taskprofile OtaProfiles" 2022-09-27 19:36:59 +00:00
Akilesh Kailash
2e780402e2 snapuserd: Set taskprofile OtaProfiles
Since update-engine already has this profile set,
it is better to have similar profile for the daemon
so that threads don't run at high priority.

Additionally, lower the nice value for worker
threads.

No change in the OTA install time observed.

Bug: 237490659
Test: Full OTA on Pixel
Change-Id: I53ec8c647eb781965792683b04621e6fec5eb5f2
Signed-off-by: Akilesh Kailash <akailash@google.com>
2022-09-27 19:36:49 +00:00
Pete Bentley
1c801c2168 Merge "Add AID for PRNG seeder daemon." am: 751cdc9489
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2229337

Change-Id: I23417a043792d6a0cd3fc0d04cd7f83f4daabecb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-26 21:45:31 +00:00
Pete Bentley
751cdc9489 Merge "Add AID for PRNG seeder daemon." 2022-09-26 21:27:42 +00:00
Eric Biggers
d76e4e01c9 bootstat: remove unused FDE boot events
Android 13 dropped support for Full Disk Encryption (FDE) entirely, as
it has been replaced by File Based Encryption (FBE).  Therefore, the
FDE-specific boot events are never emitted.  Remove them from the code:

   * boot_decryption_complete
   * boot_complete_post_decrypt
   * factory_reset_boot_complete_post_decrypt
   * ota_boot_complete_post_decrypt
   * post_decrypt_time_elapsed

Bug: 208476087
Change-Id: Id7a3bbd4f273693bd37b0cd27542dc6080d1c4f4
2022-09-26 19:50:09 +00:00
Pete Bentley
6cb61610e6 Add AID for PRNG seeder daemon.
Also adjust permissions on /dev/hw_random to allow prng_seeder group
read access.

Manual testing protocol:
* Verify prng_seeder daemon is running and has the
  correct label and uid/gid.
* Verify prng_seeder socket present and has correct
  label and permissions
* Verify no SELinux denials
* strace a libcrypto process and verify it reads seeding
  data from prng_seeder (e.g. strace bssl rand -hex 1024)
* strace seeder daemon to observe incoming connections
  (e.g. strace -f -p `pgrep prng_seeder`)
* Kill daemon, observe that init restarts it
* strace again and observe clients now seed from new instance

Bug: 243933553
Test: Manual - see above
Change-Id: I4d526844b232fc2a1fa5ffd701ca5bc5c09e7e96
2022-09-26 17:50:09 +01:00
Jiyong Park
eb7ec7b9e8 Annotate symbols correctly
Currently, tagging a symbol with #apex (# systemapi or # llndk) is not
required when the symbol is in a non-NDK library. However, this is
considered dangerous because such a symbol will automatically be
promoted to NDK APIs when the library is promoted to an NDK library.
When that happens, the native API council won't be able to notice the
promotion because promoting a non-NDK library into an NDK library
doesn't require an update of the map.txt file, but Android.bp only.

To prevent that, we should mandate those tags for Mainline APIs
regardless of whether the library the API belongs to is an NDK library
or not.

Upcoming changes in build/soong will enforce this. This change is to
prepare for the enforcement.

Note that this is a build-time only change. There's no behavior change
at runtime.

Bug: 184712170
Test: m
Change-Id: I769c5318e0cfd092f2f2b368f1a860065c79818f
2022-09-26 22:14:43 +09:00
Zhanglong Xia
1576063f49 Merge "init.rc: create /data/misc/threadnetwork folder" am: 8945a42a1e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2226357

Change-Id: I87c195c42f773692c9112692212e76eda001b9ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-26 05:07:33 +00:00
Zhanglong Xia
8945a42a1e Merge "init.rc: create /data/misc/threadnetwork folder" 2022-09-26 04:20:54 +00:00
Krzysztof Kosiński
832b63e677 storaged: Fix deprecated usages of protobuf API.
Bug: 203713560
Test: presubmit
Change-Id: I49e78c7eb65a5a99c2e8c79633704d7e60db1e60
2022-09-25 08:18:20 +00:00
Treehugger Robot
c43b1e3593 Merge "Update janitors." am: 3486f7bf43
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2229903

Change-Id: Id3ed33fd975933e9dfcc2acbbf017c22a015fa76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-23 22:28:06 +00:00
Treehugger Robot
3486f7bf43 Merge "Update janitors." 2022-09-23 21:48:30 +00:00
Elliott Hughes
b582e561a3 Update janitors.
Change-Id: I84c8104194df50d1c080a57dbf8d6f21bfb4e713
2022-09-23 20:16:03 +00:00
Treehugger Robot
b946199762 Merge "Explicitly install RemoteProvisioner for keymint" am: 173bc15585
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2219544

Change-Id: Id5b46253e553540069dd7edd14fd8ece719b23d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-23 02:10:18 +00:00
Treehugger Robot
173bc15585 Merge "Explicitly install RemoteProvisioner for keymint" 2022-09-23 00:46:20 +00:00
zhanglongxia
40e1666fb9 init.rc: create /data/misc/threadnetwork folder
This folder is used to store Thread network settings data files.

Bug: b/248145048
Test: /data/misc/threadnetwork is created.
Change-Id: I58eb3d814723c5f7acfbecef7f852d8e5336c975
2022-09-22 15:25:39 +08:00
Automerger Merge Worker
856be5e634 Merge "Merge "Some device that platform base on android12 doesn't support A/B update, it looks virtual A/B is also not mandatory. so this test case should check ro.vendor.api_level first." into android13-tests-dev am: 9be0c7bbbc" am: f2bbe1d91a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2219604

Change-Id: I30b70ff93f76358909ea43eccade756d0cb50eb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 22:36:41 +00:00
Steven Moreland
9ab2be3708 Merge "hidl2aidl: conversion of gatekeeper hidl to aidl" am: f35d1a765d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2161817

Change-Id: I4ea26b1f760a1d7262450642502da984d2568987
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 22:32:33 +00:00
Treehugger Robot
859473ce28 Merge "overlayfs: Fix -user build break" am: 7d07586695
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2222075

Change-Id: I890fb483f2d86d75b60e4bc289578eee2185658c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 22:28:13 +00:00
Treehugger Robot
1806deb5d4 Merge "Fix module-file name collisions" am: 7cad2e8654
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2205530

Change-Id: Icf100d7036ab32f2db3c14c22da92d4f84be2af9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 22:23:42 +00:00
Jaegeuk Kim
978c70eccb Merge "fs_mgr: remove atgc mount option for zoned device" am: 4ae0eb0f86
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2222346

Change-Id: Idb23ac87d80ae30eb818f3476433207e2c8320d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 22:06:10 +00:00
David Anderson
c4d75a0f06 Merge "remount: Remove unused errno propagation." am: 2dcde2a36a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2180364

Change-Id: I476f678f4bcc30528eee2c6e70241069ae3d5dd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 21:57:09 +00:00
David Anderson
81e9c6addc Merge "remount: Remove errno interaction from fs_mgr_overlayfs_teardown." am: eec8932c35
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2176922

Change-Id: I859fe1948a3a04c90d599efb3f6c28e2132fde44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 21:52:06 +00:00
Automerger Merge Worker
f2bbe1d91a Merge "Merge "Some device that platform base on android12 doesn't support A/B update, it looks virtual A/B is also not mandatory. so this test case should check ro.vendor.api_level first." into android13-tests-dev am: 9be0c7bbbc" 2022-09-21 21:31:56 +00:00
Treehugger Robot
c7d46a7b05 Merge "Some device that platform base on android12 doesn't support A/B update, it looks virtual A/B is also not mandatory. so this test case should check ro.vendor.api_level first." into android13-tests-dev am: 9be0c7bbbc
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2219604

Change-Id: I1e3dc03ad750eef1fa629f6cf8349259161e2ba2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 21:31:48 +00:00
Steven Moreland
f35d1a765d Merge "hidl2aidl: conversion of gatekeeper hidl to aidl" 2022-09-21 21:26:01 +00:00
Treehugger Robot
7d07586695 Merge "overlayfs: Fix -user build break" 2022-09-21 10:11:09 +00:00
Yi-Yo Chiang
602ac4b03c overlayfs: Fix -user build break
Bug: 241179247
Fixes: 247941706
Test: Treehugger
Change-Id: I2a7683014bb7c6f23a81a6d4b1199f19a8c184b9
2022-09-21 07:08:45 +00:00
Treehugger Robot
9be0c7bbbc Merge "Some device that platform base on android12 doesn't support A/B update, it looks virtual A/B is also not mandatory. so this test case should check ro.vendor.api_level first." into android13-tests-dev 2022-09-21 00:07:44 +00:00
Treehugger Robot
7cad2e8654 Merge "Fix module-file name collisions" 2022-09-20 23:24:20 +00:00
Jaegeuk Kim
4ae0eb0f86 Merge "fs_mgr: remove atgc mount option for zoned device" 2022-09-20 20:02:08 +00:00
Cole Faust
7e279e97a3 Fix module-file name collisions
Bazel doesn't allow a module and file with the same name.

Bug: 198619163
Test: Presubmits
Change-Id: I345086764071ca649de1ac11804e21675cd5e59d
2022-09-20 12:33:47 -07:00
David Anderson
2dcde2a36a Merge "remount: Remove unused errno propagation." 2022-09-20 18:23:29 +00:00
David Anderson
eec8932c35 Merge "remount: Remove errno interaction from fs_mgr_overlayfs_teardown." 2022-09-20 18:23:19 +00:00
Jaegeuk Kim
36755637ca fs_mgr: remove atgc mount option for zoned device
F2FS gives EINVAL when trying to mount zoned device with atgc. This patch
allows to keep the single fstab to support legacy and zoned devices at the
same time.

Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: I47a667443e7e60cb6729553b2ca24026e21fd90d
2022-09-20 10:07:18 -07:00