Commit graph

79699 commits

Author SHA1 Message Date
Sayanna Chandula
372dd0d4df Merge "init: Support reboot reason with thermal warmreset" am: 1d0fec78c4 am: fdd60d6525
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2241441

Change-Id: I9414a4a20d2006211f378a21cbe4153e89d30928
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-08 17:02:56 +00:00
Sayanna Chandula
fdd60d6525 Merge "init: Support reboot reason with thermal warmreset" am: 1d0fec78c4
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2241441

Change-Id: I2c2e12ccc7863dde1fec9907321c53c4b3888cc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-08 16:21:08 +00:00
Sayanna Chandula
1d0fec78c4 Merge "init: Support reboot reason with thermal warmreset" 2022-10-08 15:47:35 +00:00
Sayanna Chandula
5754b5ab10 init: Support reboot reason with thermal warmreset
Thermal shutdown could be due to tskin temperature or
battery temperature. Pass reason while rebooting the
system to reflect properly in boot.reason

Bug: 238464124
Test: Build and boot on device. Check reboot reason
for thermal shutdown and battery thermal shutdown with
thermal warmreset enabled.

Change-Id: I192562fed48ae7da7843e383362cd22a76ce479f
2022-10-07 14:11:25 -07:00
Treehugger Robot
ce0e22f07c Merge "Adding target (sdk-repo-platform-tools) that is used by gmac(sdk_mac) build." am: 460f70bb52 am: 7022a3f179
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2242225

Change-Id: I35687b3125cb1f0213a6e6dc7ec196e63f4dcad2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-07 04:34:45 +00:00
Yi-yo Chiang
db46673c74 Merge "remount: Remove AVB 1.0 code & opaque exit code" am: ae57e8da32 am: 36528e0383
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2241780

Change-Id: Iff721471e72c1f8fd020b14924b684dbf6ed95a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-07 04:34:37 +00:00
Treehugger Robot
7022a3f179 Merge "Adding target (sdk-repo-platform-tools) that is used by gmac(sdk_mac) build." am: 460f70bb52
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2242225

Change-Id: Ib69c62f83e567a2d67f48f92c11d81bd47661261
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-07 04:21:10 +00:00
Treehugger Robot
460f70bb52 Merge "Adding target (sdk-repo-platform-tools) that is used by gmac(sdk_mac) build." 2022-10-07 04:13:51 +00:00
Yi-yo Chiang
36528e0383 Merge "remount: Remove AVB 1.0 code & opaque exit code" am: ae57e8da32
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2241780

Change-Id: Icf53206a82e477359d2f09ded8f0093f6f6f65a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-07 04:05:49 +00:00
Yi-yo Chiang
ae57e8da32 Merge "remount: Remove AVB 1.0 code & opaque exit code" 2022-10-07 03:47:03 +00:00
Bob Badour
ae01235f23 Merge "Add LOCAL_LICENSE_KINDS to system/core" am: e2b1d3c846 am: f929b7ed90
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2242223

Change-Id: I6fe192c39cddc8eb086312171324198bc3006a85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-06 23:31:53 +00:00
Bob Badour
f929b7ed90 Merge "Add LOCAL_LICENSE_KINDS to system/core" am: e2b1d3c846
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2242223

Change-Id: Ib048097c01fb35b113df7d694dc8e05cddcf5a6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-06 23:03:39 +00:00
Shaju Mathew
6c27f235cf Adding target (sdk-repo-platform-tools) that is used by gmac(sdk_mac) build.
Bug: 249370316
Test: N/A (coastguard)

Signed-off-by: Shaju Mathew <shaju@google.com>
Change-Id: I641d4f8dc60652c7e8eaebafd905090d3c0324f2
2022-10-06 22:37:09 +00:00
Bob Badour
e2b1d3c846 Merge "Add LOCAL_LICENSE_KINDS to system/core" 2022-10-06 22:28:09 +00:00
Xin Li
d79fb6e986 Mark tm-qpr-dev-plus-aosp-without-vendor@9129937 as merged am: ac5c3afbbd
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/20130907

Change-Id: I8f0c9e62d0be969ec2dc0ce02acd4bfd14486b88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-06 22:17:21 +00:00
Xin Li
ac5c3afbbd Mark tm-qpr-dev-plus-aosp-without-vendor@9129937 as merged
Ignore-AOSP-First: empty marker merge
Change-Id: I9d8ad4253682dae129aaf8fa42ac3f8971ad4ae1
2022-10-06 14:03:38 -07:00
Bob Badour
03d5052754 Add LOCAL_LICENSE_KINDS to system/core
Added SPDX-license-identifier-Apache-2.0 to:
  init/fuzzer/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Change-Id: I2db55c80799d0a8fc5935d9b07a2ddb17eb7235e
2022-10-06 19:59:07 +00:00
Treehugger Robot
c48a5ef975 Merge changes I264d0891,I1af733e7,Iae344c1e am: 71d9f3607b am: 9a18d8b3be
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2027223

Change-Id: Ife728d497fcbbcb3b005a61551712dbbb8a5f05f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-06 14:52:57 +00:00
Treehugger Robot
9a18d8b3be Merge changes I264d0891,I1af733e7,Iae344c1e am: 71d9f3607b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2027223

Change-Id: I0cfdb91bc5524d1d1b8c257f27dd800141acb03d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-06 14:23:12 +00:00
Treehugger Robot
71d9f3607b Merge changes I264d0891,I1af733e7,Iae344c1e
* changes:
  Added init_ueventHandler_fuzzer
  Added init_property_fuzzer
  Added init_parser_fuzzer
2022-10-06 13:59:37 +00:00
Yi-Yo Chiang
ce2dbd009f remount: Remove AVB 1.0 code & opaque exit code
* Remove AVB 1.0 (fec).
* Assert device is bootloader unlocked in main().
* Since error is already logged to stderr and logd, there is no need to
  return an opaque enum value as error code. Just return 1 if main()
  encounters any error.

Bug: 241688845
Test: Presubmit
Test: adb-remount-test
Change-Id: I06df6f92a3d4adaca77061920736056c9051c112
2022-10-06 18:54:19 +08:00
Yi-yo Chiang
5fffb4a91c Merge changes I8b5e08a3,Iccfe06f9 am: 5653687caf am: 9b050715f4
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2240456

Change-Id: Id96f172a6064f022749fdb432eeb6ac0e83261d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-06 07:11:39 +00:00
Yi-yo Chiang
9b050715f4 Merge changes I8b5e08a3,Iccfe06f9 am: 5653687caf
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2240456

Change-Id: I281680014a024710e489864ca1197e29c9b5f822
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-06 06:42:20 +00:00
Yi-yo Chiang
5653687caf Merge changes I8b5e08a3,Iccfe06f9
* changes:
  fs_mgr_overlayfs: Remove support for physical scratch
  fs_mgr_overlayfs: Refactor scratch mounting code
2022-10-06 06:19:12 +00:00
Wayne Ma
cecb1020d2 Merge "Make libstatspull_bindgen available to resolv apex." am: 78e23f23ce am: 8743cdac75
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2235854

Change-Id: Ie06820af76252448f997aa1a416ab116ffe34d62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-06 02:19:53 +00:00
Wayne Ma
8743cdac75 Merge "Make libstatspull_bindgen available to resolv apex." am: 78e23f23ce
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2235854

Change-Id: I5f64861896e92a68797704e9b3c0a65c591a834f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-06 01:52:40 +00:00
Wayne Ma
78e23f23ce Merge "Make libstatspull_bindgen available to resolv apex." 2022-10-06 01:28:18 +00:00
Pete Bentley
309102b314 [automerger skipped] Add AID for PRNG seeder daemon. am: 046a809a90 -s ours
am skip reason: Merged-In I4d526844b232fc2a1fa5ffd701ca5bc5c09e7e96 with SHA-1 6cb61610e6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/20112204

Change-Id: Ief18dda967893754afbfc4188ef834163c468d43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-05 16:26:23 +00:00
Yi-yo Chiang
e75f89dc03 Merge "fs_mgr_overlayfs: Cleanup -user build stubs" am: 27cf51e71c am: 453a130291 am: bd1a49c358 am: 46178f7244
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2224197

Change-Id: I76b6b16b5264e1aa9f984139ab09276e97bc9898
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-05 11:25:07 +00:00
Yi-yo Chiang
46178f7244 Merge "fs_mgr_overlayfs: Cleanup -user build stubs" am: 27cf51e71c am: 453a130291 am: bd1a49c358
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2224197

Change-Id: I2aeec96ecf895c273380be430eeb5b60d7aa10db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-05 10:59:17 +00:00
Yi-yo Chiang
bd1a49c358 Merge "fs_mgr_overlayfs: Cleanup -user build stubs" am: 27cf51e71c am: 453a130291
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2224197

Change-Id: Ia35f603e5a2b54ae616c42a83c9e5241643fd2c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-05 10:29:16 +00:00
Yi-yo Chiang
453a130291 Merge "fs_mgr_overlayfs: Cleanup -user build stubs" am: 27cf51e71c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2224197

Change-Id: I6566a2e31c6182a550c409de4908d21fddb011e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-05 09:56:47 +00:00
Yi-yo Chiang
27cf51e71c Merge "fs_mgr_overlayfs: Cleanup -user build stubs" 2022-10-05 09:19:45 +00:00
Pete Bentley
046a809a90 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
Merged-In: I4d526844b232fc2a1fa5ffd701ca5bc5c09e7e96
(cherry picked from commit 6cb61610e6)
2022-10-05 00:11:56 +01:00
Pete Bentley
553260d97e [automerger skipped] Merge "init: Add option to listen on sockets before starting service." into tm-qpr-dev am: 0024d68287 -s ours
am skip reason: Merged-In I91b3b2b1fd38cc3d96e19e92b76c8e95788191d5 with SHA-1 ecc14a5958 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/20026125

Change-Id: Id8d81a4691074cbfc79e634a8ad11f7f611ba3c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-04 22:32:11 +00:00
Adam Langley
4e744ef97e [automerger skipped] init: Add option to listen on sockets before starting service. am: 56a658874b -s ours
am skip reason: Merged-In I91b3b2b1fd38cc3d96e19e92b76c8e95788191d5 with SHA-1 ecc14a5958 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/20026125

Change-Id: I9ab222157f3aadde9f85b048e7d9cc5f8649d897
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-04 22:32:05 +00:00
Pete Bentley
0024d68287 Merge "init: Add option to listen on sockets before starting service." into tm-qpr-dev 2022-10-04 22:10:35 +00:00
David Anderson
8f1d7ea107 Merge "init: Statically link libbootloader_message." am: aaa16bbad4 am: d30c5df76f am: 14ba0cdb56 am: 1ea74e50b6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2240121

Change-Id: Ia36f5cd59fb1dab1a40b5253087ebcac0d8bdc51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-04 18:36:23 +00:00
David Anderson
1ea74e50b6 Merge "init: Statically link libbootloader_message." am: aaa16bbad4 am: d30c5df76f am: 14ba0cdb56
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2240121

Change-Id: I76cd3552b05885777f75d72de056286dfd020d3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-04 18:07:58 +00:00
David Anderson
14ba0cdb56 Merge "init: Statically link libbootloader_message." am: aaa16bbad4 am: d30c5df76f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2240121

Change-Id: I0f5815ad40043e118d6e95f5165bf105c01c4911
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-04 17:38:15 +00:00
Yi-Yo Chiang
9032c00869 fs_mgr_overlayfs: Remove support for physical scratch
Deprecate physical scratch path, support only dynamic partition scratch
and scratch on /cache.

Bug: 243116800
Test: adb-remount-test
Change-Id: I8b5e08a38e323139b56b169865dcaf1a6620cf20
2022-10-05 01:13:32 +08:00
Yi-Yo Chiang
ea2f32a438 fs_mgr_overlayfs: Refactor scratch mounting code
Make the control flow less chaotic and rename to cpp style function
name.

Bug: 243116800
Test: adb-remount-test
Change-Id: Iccfe06f9cb9659b7b0bad085250422e298cc4f27
2022-10-05 01:11:18 +08:00
David Anderson
d30c5df76f Merge "init: Statically link libbootloader_message." am: aaa16bbad4
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2240121

Change-Id: Id215c3813f82fc7231c9b784efd36a189c12003e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-04 17:04:51 +00:00
Wayne Ma
8044045a1e Make libstatspull_bindgen available to resolv apex.
Test: m successed
Change-Id: Ia367ab5a87794c82238291b27a783278f319e767
2022-10-05 00:54:47 +08:00
David Anderson
aaa16bbad4 Merge "init: Statically link libbootloader_message." 2022-10-04 16:32:50 +00:00
Yi-yo Chiang
35f09013ba Merge "remount: Remove errno test & improve messaging of fs_mgr_overlayfs_mount_all" am: 7214c98d2e am: d7d2bab857 am: 0e1b203415 am: b895be9ec3
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2228578

Change-Id: I31e7852d244ef97277944d60a8a86d0c708558c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-04 08:33:28 +00:00
Yi-yo Chiang
b895be9ec3 Merge "remount: Remove errno test & improve messaging of fs_mgr_overlayfs_mount_all" am: 7214c98d2e am: d7d2bab857 am: 0e1b203415
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2228578

Change-Id: If209be23861c277eab3de3bb023d6aa1b5a91dc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-04 07:52:21 +00:00
Yi-yo Chiang
0e1b203415 Merge "remount: Remove errno test & improve messaging of fs_mgr_overlayfs_mount_all" am: 7214c98d2e am: d7d2bab857
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2228578

Change-Id: I220794aa0c5f3c0d11d8be6039ac02a7a853fb20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-04 07:24:14 +00:00
Yi-yo Chiang
d7d2bab857 Merge "remount: Remove errno test & improve messaging of fs_mgr_overlayfs_mount_all" am: 7214c98d2e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2228578

Change-Id: I36109eedbf286f35b36373845a60c89f54da2880
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-04 06:52:17 +00:00
Yi-yo Chiang
7214c98d2e Merge "remount: Remove errno test & improve messaging of fs_mgr_overlayfs_mount_all" 2022-10-04 06:27:27 +00:00