David Drysdale
8175edf8d3
Merge changes from topic "keymint-v3" into main am: 014c710c27 am: 735298c3b5
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3345023
Change-Id: Ibbe734353e7f31857be5337a045276d238f8d656
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-13 07:37:29 +00:00
David Drysdale
735298c3b5
Merge changes from topic "keymint-v3" into main am: 014c710c27
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3345023
Change-Id: Icd1a9341b61b24ac4ff1c461afc746867c3f4397
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-13 07:15:21 +00:00
David Drysdale
014c710c27
Merge changes from topic "keymint-v3" into main
...
* changes:
Declare previous version when using frozen HALs
Set the proper FEATURE_HARDWARE_KEYSTORE version
2024-11-13 06:50:42 +00:00
Florian Mayer
c1e9bc1a5a
Merge "Remove mitchp from OWNERS file" into main am: 574ae66ee6 am: 9ce2ae15fc
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3343146
Change-Id: I0334f1add9dbbfe339d61214d22091720d408955
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-12 21:54:49 +00:00
Florian Mayer
9ce2ae15fc
Merge "Remove mitchp from OWNERS file" into main am: 574ae66ee6
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3343146
Change-Id: Icb636faf29fe8ceacb8dd755fea42ed1c5f5b058
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-12 21:33:00 +00:00
Florian Mayer
574ae66ee6
Merge "Remove mitchp from OWNERS file" into main
2024-11-12 20:51:20 +00:00
Florian Mayer
4be70e7db3
Remove mitchp from OWNERS file
...
Change-Id: Ifb0e1598f3908fcc2206a2b51611b996f8b48cb8
2024-11-12 20:46:08 +00:00
Florian Mayer
b3aa0f96c7
Merge "Test stack buffer size calculation." into main am: a7da00f4f0 am: 785789b830
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3342429
Change-Id: I57264e5a58dc64e02f609bfe082755a07acc6a2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-12 19:38:26 +00:00
Florian Mayer
785789b830
Merge "Test stack buffer size calculation." into main am: a7da00f4f0
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3342429
Change-Id: Ib1211301c68528998ca9f481204977ecaf3b3caf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-12 19:14:33 +00:00
Florian Mayer
a7da00f4f0
Merge "Test stack buffer size calculation." into main
2024-11-12 18:51:39 +00:00
Treehugger Robot
ae1c5d3a81
Merge "Add BOARD_GENFS_LABELS_VERSION" into main am: 7adba5989c am: c2ade867be
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3337494
Change-Id: Ided0d782a321882dc30967d173a3453c831c804a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-12 02:16:17 +00:00
Jooyung Han
f546c9f8e0
Merge "Revert^2 "Deprecating libvendorsupport_llndk_headers"" into main am: 92d1597718 am: cb57a87502
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3342057
Change-Id: Ic479a265c09cbf94af5ee66ecc31c899a00b03e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-12 02:15:40 +00:00
Treehugger Robot
c2ade867be
Merge "Add BOARD_GENFS_LABELS_VERSION" into main am: 7adba5989c
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3337494
Change-Id: I70b57ba43294bb8638707c21d1ccf831db00fd13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-12 01:54:08 +00:00
Jooyung Han
cb57a87502
Merge "Revert^2 "Deprecating libvendorsupport_llndk_headers"" into main am: 92d1597718
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3342057
Change-Id: I0633530cc01567dbbefe98e2c14c4064edd3610d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-12 01:52:54 +00:00
Treehugger Robot
7adba5989c
Merge "Add BOARD_GENFS_LABELS_VERSION" into main
2024-11-12 01:42:47 +00:00
Jooyung Han
92d1597718
Merge "Revert^2 "Deprecating libvendorsupport_llndk_headers"" into main
2024-11-12 01:35:41 +00:00
Florian Mayer
6facd1bfd3
Test stack buffer size calculation.
...
Bug: 378140560
Change-Id: Idca03cac925bc0d8bd574817391c4eaca11f2bff
2024-11-11 14:03:00 -08:00
David Drysdale
5969d69248
Declare previous version when using frozen HALs
...
The KeyMint HAL has been updated to v4, but frozen builds (e.g. 25Q1)
remain on the previous version. The core AIDL version is handled
automatically, but we also have a package manager flag whose value
is (100 * HAL-version). Use `RELEASE_AIDL_USE_UNFROZEN` to switch
between `required` configs for that.
Test: TreeHugger
Bug: 377808462
Bug: 378026324
Change-Id: Id042bee2a81e8563e1029ea7bb43452715e3edee
2024-11-11 19:17:20 +00:00
Karuna Wadhera
e8ff8b494a
Set the proper FEATURE_HARDWARE_KEYSTORE version
...
The binary implements V3 of the KeyMint HAL, so the feature version
should match.
Bug: 369375199
Bug: 378384123
Test: treehugger
Change-Id: Ib26ac73cf6593d9a50f7a019129c6e5e237ae2cd
2024-11-11 18:06:30 +00:00
Dennis Shen
65562ad380
Merge "Start aconfigd_system processes in init.rc" into main am: b842f642d9 am: a882da3ae7
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3343282
Change-Id: Id5a9d0ed81c804e3be31fbd74b19aa663ab52814
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-11 15:21:27 +00:00
Dennis Shen
a882da3ae7
Merge "Start aconfigd_system processes in init.rc" into main am: b842f642d9
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3343282
Change-Id: Ia671c3fce477f4bfb7050a5fe96e4074da6d0fda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-11 14:58:53 +00:00
Dennis Shen
b842f642d9
Merge "Start aconfigd_system processes in init.rc" into main
2024-11-11 14:33:09 +00:00
Treehugger Robot
cf9b3a3538
Merge "init: Avoid extra string copies when finding devices by using const refs" into main am: fa528cccf6 am: 2bf55942ab
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3342430
Change-Id: I05bb1da082748cee4d1bd53809d37fe688cade86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-11 02:52:58 +00:00
Treehugger Robot
2bf55942ab
Merge "init: Avoid extra string copies when finding devices by using const refs" into main am: fa528cccf6
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3342430
Change-Id: I48357c43e2aeed627af60a6ef7be4ec40470416e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-11 02:31:02 +00:00
Treehugger Robot
fa528cccf6
Merge "init: Avoid extra string copies when finding devices by using const refs" into main
2024-11-11 02:05:44 +00:00
Jooyung Han
dbb080d9bf
Revert^2 "Deprecating libvendorsupport_llndk_headers"
...
ab8f9717f1
Change-Id: Ie981692be554942df762a4c9be7c250b0b202f31
2024-11-09 02:41:13 +00:00
Douglas Anderson
46afe22f9d
init: Avoid extra string copies when finding devices by using const refs
...
Now that FindPlatformDevice() isn't modifying the path argument, and
is just passing it on to FindSubsystemDevice(), take this argument by
const reference. That should avoid an unnecessary string copy.
Bug: 316324155
Test: Compile
Change-Id: I1d92a322d0c311ee46a117dd9d650896ec02520f
2024-11-08 15:48:35 -08:00
Priyanka Advani (xWF)
0d28234612
Merge "Revert "Deprecating libvendorsupport_llndk_headers"" into main am: 244a63066b am: 886b9483c6
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3341360
Change-Id: I17068a35669098cab40ddffbcfd1a645f9419305
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-08 20:00:48 +00:00
Priyanka Advani (xWF)
886b9483c6
Merge "Revert "Deprecating libvendorsupport_llndk_headers"" into main am: 244a63066b
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3341360
Change-Id: I2e954552168ce55859d78aa81bb195afbd9e73c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-08 19:36:31 +00:00
Priyanka Advani (xWF)
244a63066b
Merge "Revert "Deprecating libvendorsupport_llndk_headers"" into main
2024-11-08 19:05:16 +00:00
Ted Bauer
3c700588c7
Start aconfigd_system processes in init.rc
...
aconfigd_system is replacing aconfigd. Which one executes is toggled
by RO flag enable_system_aconfigd_rust, introduced in https://android-review.googlesource.com/q/topic:%22switch-to-aconfigd-system%22 .
Bug: 378079539
Test: m
Change-Id: I6a04c38e9ef22da2b230046ddace73d6f7e39652
2024-11-08 17:45:16 +00:00
Priyanka Advani (xWF)
ab8f9717f1
Revert "Deprecating libvendorsupport_llndk_headers"
...
Revert submission 3334193-no-llndk-versioning
Reason for revert: Droidmonitor created revert due to b/378038995. Will be verifying through ABTD before submission.
Reverted changes: /q/submissionid:3334193-no-llndk-versioning
Change-Id: Id8d85be1930bef68f94cee66a0fe29278de48d64
2024-11-08 17:37:26 +00:00
Inseob Kim
76afb4a2c2
Add BOARD_GENFS_LABELS_VERSION
...
If it's 202504 or later, /sys/class/udc will be labeled as sysfs_udc. If
it's not set, /sys/class/udc will stay at the label sysfs. This is to
support GRF vendors older than 202504.
202404 or old vendors can choose either way. If they want to customize
permissions to /sys/class/udc, they can turn off
BOARD_GENFS_LABELS_VERSION and assign their own label to /sys/class/udc
/sys/class/udc with vendor sepolicy.
202504 or newer vendors must set BOARD_GENFS_LABELS_VERSION to a version
greater than or equal to 202504.
For now there's only one node /sys/class/udc, but more labels can be
added until 202504 freeze.
Bug: 361985697
Test: boot with and without BOARD_GENFS_LABELS_VERSION
Change-Id: I1a28109119368f1475628be85dd8d990c824922e
2024-11-08 16:41:45 +09:00
Treehugger Robot
1fde6848d1
Merge "Deprecating libvendorsupport_llndk_headers" into main am: 2a5bef2e98 am: ad0f3f67b7
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3337493
Change-Id: I0a2b9677a2b8e246c1cf159db7924b9166c82124
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-08 07:25:47 +00:00
Treehugger Robot
ad0f3f67b7
Merge "Deprecating libvendorsupport_llndk_headers" into main am: 2a5bef2e98
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3337493
Change-Id: Iccfcdd698dfe8cc2921333b0c0eb64ce34efef10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-08 07:03:49 +00:00
Treehugger Robot
2a5bef2e98
Merge "Deprecating libvendorsupport_llndk_headers" into main
2024-11-08 06:29:05 +00:00
Hung Nguyen
1aa78079e5
Merge "Increase zram size percentage limit" into main am: fb954abea6 am: f278c9ce19
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3343241
Change-Id: Ia6bb1c5bbd26eda03030158667526c83b66fc63c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-08 06:07:35 +00:00
Hung Nguyen
f278c9ce19
Merge "Increase zram size percentage limit" into main am: fb954abea6
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3343241
Change-Id: If9ca6ab46167e7136995b011afe736cbeb7ccd25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-08 05:35:57 +00:00
Hung Nguyen
fb954abea6
Merge "Increase zram size percentage limit" into main
2024-11-08 05:09:37 +00:00
Treehugger Robot
9bd2249e15
Merge "Increase the test timeout" into main am: 308bcbea8e am: 1d4ac1eed6
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3342095
Change-Id: Id03cbd8cc126e57f9ab9fe78ef825ec235c9c820
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-07 23:58:38 +00:00
Treehugger Robot
1d4ac1eed6
Merge "Increase the test timeout" into main am: 308bcbea8e
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3342095
Change-Id: I8cf8374f3cae4f188594ade50ededc6bd3d8f7cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-07 23:25:53 +00:00
Hung Nguyen
ce6f7330ad
Increase zram size percentage limit
...
To allow experimenting with zram size larger than device memory size.
Bug: 368286978
Test: atest CtsFsMgrTestCases
Change-Id: I47a4a4e6af39571d13e4622d110c92936008127e
2024-11-07 15:16:17 -08:00
Treehugger Robot
308bcbea8e
Merge "Increase the test timeout" into main
2024-11-07 23:07:11 +00:00
Akilesh Kailash
e5a2af34b3
Increase the test timeout
...
Bug: 338329603
Test: Build success
Change-Id: I97008dbe112d87ef2f4bff5605beb41cc4b1fac7
Signed-off-by: Akilesh Kailash <akailash@google.com>
2024-11-07 13:43:13 -08:00
Treehugger Robot
6d1271340a
Merge "init: Look for partition only on a boot device if using boot_part_uuid" into main am: c43fd51571 am: c4c178bafb
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3336854
Change-Id: Id6f6b775cf12b311b300943b3fa141c83810308c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-07 18:00:00 +00:00
Treehugger Robot
c4c178bafb
Merge "init: Look for partition only on a boot device if using boot_part_uuid" into main am: c43fd51571
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3336854
Change-Id: Ifea13a041e88cdf333b3bd95b2449fb21e961d37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-07 17:35:09 +00:00
Treehugger Robot
c43fd51571
Merge "init: Look for partition only on a boot device if using boot_part_uuid" into main
2024-11-07 16:59:48 +00:00
Doug Anderson
1f9404c089
Merge changes If824cb70,I025d9d68,Ic5a57a89,If5d63f39,I1adb1906 into main am: f3e994b439 am: c4ce6111b4
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3318438
Change-Id: I6f2c389dfffe268e3e908953e134f7e8dfccc11d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-07 16:24:20 +00:00
Doug Anderson
c4ce6111b4
Merge changes If824cb70,I025d9d68,Ic5a57a89,If5d63f39,I1adb1906 into main am: f3e994b439
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3318438
Change-Id: I251001b955a0ea61ec84fc5e6389b09666087146
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-11-07 15:59:51 +00:00
Doug Anderson
f3e994b439
Merge changes If824cb70,I025d9d68,Ic5a57a89,If5d63f39,I1adb1906 into main
...
* changes:
init: Add the ability to find the boot device by partition UUID
init: Move the stripping of "/devices" and "/devices/platform/" to a helper
init: Break FindPlatformDevice() into a helper function
init: Factor GetBlockDeviceInfo() out of GetBlockDeviceSymlinks()
init: Use ConsumePrefix() instead of open coding in GetBlockDeviceSymlinks()
2024-11-07 15:28:10 +00:00