summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2025-04-12Import translations. DO NOT MERGE ANYWHERE Bill Yi
Auto-generated-cl: translation import Bug: 408276020 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:07b8720c6cc276d90ffefd9e9d7493cf2bb5f620) Merged-In: Ifb212bd2d39923b1270a86e62b62f06755ee817a Change-Id: Ifb212bd2d39923b1270a86e62b62f06755ee817a
2025-04-12Import translations. DO NOT MERGE ANYWHERE Bill Yi
Auto-generated-cl: translation import Bug: 408276020 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5b8772d993e99f0a5cee7b56a618268374eea3b3) Merged-In: I758712b7fe97f704997a728fc95edc37794e9395 Change-Id: I758712b7fe97f704997a728fc95edc37794e9395
2025-04-12Disable body sensors permission upgrade test Scarlett Song
For targetSdk<23 apps, split permissions will go throught a review process when app upgrades. For now this will trigger HealthFitness revoke read heart rate permission alongside body sensors permission. To mitigate the issue we disable this test for now as the impact is only limited to uncommon use cases. Flag: EXEMPT bugfix Relnote: N/A Bug: 406669065 LOW_COVERAGE_REASON=TEST_ONLY (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4c7ef606a14ea5f111ab72ba0f7c27f5e2bfbd86) Merged-In: Icd5955d09ee52e1d3222976288f5281ee3ebd0a4 Change-Id: Icd5955d09ee52e1d3222976288f5281ee3ebd0a4
2025-04-10Merge cherrypicks of ['googleplex-android-review.googlesource.com/32899264', ↵ Android Build Coastguard Worker
'googleplex-android-review.googlesource.com/32978037'] into 25Q2-release. Change-Id: I27fd5fe92e075c77e758a25de09f80e8670c404f
2025-04-10Revert "Add READ/WRITE_SYSTEM_PREFERENCES permissions to ASSISTANT role" Chris Antol
This reverts commit 0b3022e555fdf158dbdcc5171e24e1c574e0a9fe. Reason for revert: b/409604217 Relnote: N/A NO_IFTTT=not applicable (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0c8729509e4e444734e4d8827ad4e5b29b14fc62) Merged-In: Iab3a924bb0d9a2b81e19ec04d74c50491a062faa Change-Id: Iab3a924bb0d9a2b81e19ec04d74c50491a062faa
2025-04-10Temporarily stop getting user from call Nate Myren
This is being removed, due to unidentified crashed. Ensures the incall test doesn't run on HSUM builds. Bug: 408470449 Test: atest EnhancedConfirmationInCallTest Flag: EXEMPT critical crash fix Relnote: None (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:671bad75d3c80c9ac73b767b3e06f71c29ce8f86) Merged-In: I38253e0cdae80fb9116e38926af81c642cbbd144 Change-Id: I38253e0cdae80fb9116e38926af81c642cbbd144
2025-04-09Merge cherrypicks of ['googleplex-android-review.googlesource.com/32852561'] ↵ Android Build Coastguard Worker
into 25Q2-release. Change-Id: Id2cf2dac362d9ad60815f74cdf0d56d16c9d942a
2025-04-09Run AppPermissionsTest from Android 16+ Biswarup Pal
ag/31382100 (which adds the CREATE_VIRTUAL_DEVICE permission to the com.android.shell package) isn't there in Android 15, but its there in Android 16. So, AppPermissionsTest fails on 25Q1 builds, as it relies on shell for the above permission. So, we annotate the test to run on Android 16+, similar to DeviceAwarePermissionGrantTest. Relnote: Annotate AppPermissionsTest to run on Android 16 and above Test: atest AppPermissionsTest Fixes: 406924219 LOW_COVERAGE_REASON=TEST_ONLY Flag: EXEMPT test fix (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:eeae3f36407bd8cac7d69eeaa64cad939215902f) Merged-In: I5ff1a33d146112c048a18adbbe2753b76d55078f Change-Id: I5ff1a33d146112c048a18adbbe2753b76d55078f
2025-04-02Merge cherrypicks of ['googleplex-android-review.googlesource.com/32832034'] ↵ Android Build Coastguard Worker
into 25Q2-release. Change-Id: Iacf2fe9fd902550c91d181a94603d4dedfcab74f
2025-04-02Import translations. DO NOT MERGE ANYWHERE Bill Yi
Auto-generated-cl: translation import Bug: 406841318 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4dfd1df3f97486edbfdefbf3cfb235bdba18901c) Merged-In: Ib55f1be65e14d35f1e46c5cfa467b15a7f43f430 Change-Id: Ib55f1be65e14d35f1e46c5cfa467b15a7f43f430
2025-03-24Snap for 13264465 from b2b294f5a9e29ac7753981678ea98b1fbb466ad7 to 25Q2-release Android Build Coastguard Worker
Change-Id: I6b817705e69fad44a3bbbd8703e3958e12746f41
2025-03-24[automerger skipped] DO NOT MERGE: Allow OEMs to backport ↵ Tony Mak
EXECUTE_APP_FUNCTIONS_TRUSTED before A16. am: 6a6eca858b -s ours am: 26231a7eac -s ours am skip reason: Merged-In I69f829007fa7466f2f7f7e0ba5dde0d26e770219 with SHA-1 ed96ffadcb is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/Permission/+/3558063 Change-Id: I0dcd67e1e0a1cc67a3177e9ce1875a8b17cd2bf8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-03-24[automerger skipped] DO NOT MERGE: Allow OEMs to backport ↵ Tony Mak
EXECUTE_APP_FUNCTIONS_TRUSTED before A16. am: 6a6eca858b -s ours am skip reason: Merged-In I69f829007fa7466f2f7f7e0ba5dde0d26e770219 with SHA-1 ed96ffadcb is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/Permission/+/3558063 Change-Id: If1928102d142c729c2d627646780fc4713f42e92 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-03-24DO NOT MERGE: Allow OEMs to backport EXECUTE_APP_FUNCTIONS_TRUSTED before A16. Tony Mak
This permission is now removed in Android 16. However, OEMs backported a different snapshots of Android 16 and so we need to get the CTS passing with and without this permission in Android 15. Bug: 402647068 Test: presubmit Merged-In: I69f829007fa7466f2f7f7e0ba5dde0d26e770219 Change-Id: I0fa30a2b2ea058f59ec04cac352ee9e135eea8ca
2025-03-24Merge "Allow the SYSTEM_SUPERVISION role to be set for CTS" into main Jason Parks
2025-03-24[automerger skipped] DO NOT MERGE Allow OEM to backport ↵ Tony Mak
EXECUTE_APP_FUNCTIONS permission before A16 am: 5a172211f9 -s ours am: a69448710d -s ours am skip reason: Merged-In I69f829007fa7466f2f7f7e0ba5dde0d26e770219 with SHA-1 ed96ffadcb is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/Permission/+/3554586 Change-Id: Ic5b50044642717e05a7fb3bf614e9849ed3a3579 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-03-24[automerger skipped] DO NOT MERGE Allow OEM to backport ↵ Tony Mak
EXECUTE_APP_FUNCTIONS permission before A16 am: 5a172211f9 -s ours am skip reason: Merged-In I69f829007fa7466f2f7f7e0ba5dde0d26e770219 with SHA-1 ed96ffadcb is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/Permission/+/3554586 Change-Id: I1136d9f0c21783d0402a1b8f01eb17ff779f815e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-03-22Snap for 13258483 from 6171beb2c5dfd308e78bcf8b424158b958ef737e to 25Q2-release Android Build Coastguard Worker
Change-Id: I989bbd376a2248ea0757bf056ca77b6f22785fea
2025-03-21Snap for 13256841 from 0ee3e3832d76927465e054cc4716b72033cea0ec to 25Q2-release Android Build Coastguard Worker
Change-Id: I4fdc2a3bd4b5bb5896176a091e76925c2ce972bf
2025-03-21Merge "Permissions: Fix admin restricted CTS Test." into main Justin Lannin
2025-03-21Permissions: Fix admin restricted CTS Test. Justin Lannin
The PermissionUsageViewModelTest in the test suite was adding a health permission to the platform list which was causing the HEALTH permission group to be considered restricted. When we checked with the group it would then always return restricted even before we added the permission we were checking to the list. Now we remove the explicit group from being passed in. The point of this test is mostly to ensure that permissions that are added to the list become restricted rather than being about health specifically. The inprocess tests cover the health permissions getting added. Bug: 403921690 Test: atest PermissionControllerMockingTests Flag: EXEMPT bugfix Relnote: N/A LOW_COVERAGE_REASON=TEST_ONLY Change-Id: Ibba609dbe28c637206f17f375e273888d565f5c9
2025-03-21Merge "[BC25] Add isExpressiveDesignEnabled to Utils" into main Yi-an Chen
2025-03-21[BC25] Add isExpressiveDesignEnabled to Utils Yi-an Chen
Add isExpressiveDesignEnabled to determine whether the expressive design is enabled to permission controller. Bug: 349675008 Flag: com.android.settingslib.widget.theme.flags.is_expressive_design_enabled Test: Build Relnote: N/A Change-Id: I139d954be115eb6031d2ce900b8aecc4795604b4
2025-03-21DO NOT MERGE Allow OEM to backport EXECUTE_APP_FUNCTIONS permission before A16 Tony Mak
Bug: 402647068 Test: presubmit Merged-In: I69f829007fa7466f2f7f7e0ba5dde0d26e770219 Change-Id: I7e81286db40d86c3d0b6a41f731a25213e79e35b
2025-03-21Allow the SYSTEM_SUPERVISION role to be set for CTS Jason Parks
Bug: 378102594 Flag: android.app.supervision.flags.supervision_manager_apis Test: atest CtsSupervisionTestCases Relnote: N/A Change-Id: Iec86b5423299ae0d43d5e40ff5184ede0a8095b6
2025-03-21Merge "Add the MTE policy to the shell roles" into main Eran Messeri
2025-03-21Add the MTE policy to the shell roles Eran Messeri
It is safe for the shell to have this permission because: * A human can query and modify the state of the Memory Tagging Extension policy via Developer Options. * If the device is managed and the user tries to disable MTE, there is an additional check in the DevicePolicyManagerService that only the device policy client (DPC) can disable MTE. Bug: 402456665 Test: atest CtsSecurityTestCases:android.security.cts.advancedprotection.MemoryTaggingExtensionTest Flag: EXEMPT bugfix Relnote: Adding the MANAGE_DEVICE_POLICY_MTE permission to the Shell for testing. LOW_COVERAGE_REASON=NON_CODE_ONLY Change-Id: I674b360342820cd159a66467bd332fe7a2f6d84a
2025-03-21Merge "Change the order to make fingerprint source appear first." into main Jan Tomljanovic
2025-03-21Change the order to make fingerprint source appear first. Jan Tomljanovic
Bug: 404330965 Test: manual Flag: NONE xml config change Relnote: N/a Change-Id: I6a111dd4e0d99d14c82a601abc3f5368ee6ee4be LOW_COVERAGE_REASON=b/360423897
2025-03-20Merge "WearAppPermissionGroupsHelper: Prioritize platform permissions on ↵ Justin Lannin
AppInfo page." into main
2025-03-20WearAppPermissionGroupsHelper: Prioritize platform permissions on AppInfo page. Justin Lannin
The HEALTH permission group is created by the healthfitness mainline module and not the OS_PKG. This meant that even though it is a platform permission group that it was getting sorted to the bottom of the list. Now we partition permissions based on whether they are platform permissions to ensure it takes it's rightful spot near the top. Bug: 404941005 Test: Locally built, verified ordering was fixed. Flag: EXEMPT bugfix Relnote: Fixing permission order on Wear App info page. LOW_COVERAGE_REASON=OTHER_FORM_FACTOR Change-Id: I33d901d330cd963494f83a0e4b778db3aebfb529
2025-03-20Merge "Support health split permission check for targetSdk<23 apps" into main Scarlett Song
2025-03-20Support health split permission check for targetSdk<23 apps Scarlett Song
Test: atest HealthConnectAppPermissionFragmentTest Bug: 403337565 Flag: android.permission.flags.replace_body_sensor_permission_enabled Relnote: Health permission split BODY_SENSORS to READ_HEART_RATE LOW_COVERAGE_REASON=b/405152547 Change-Id: I770fdf9a551bb53a6e0d7adccd39ea6bf285c57b
2025-03-20Merge "HealthFitness: Disable HealthFitness label tests until baseline build ↵ Scarlett Song
catches up" into main
2025-03-20Snap for 13248265 from a3c1eeb7eea1274bdad40ec6cafb86de905e4ba6 to 25Q2-release Android Build Coastguard Worker
Change-Id: I07104fa835fcb2977b4b56f3ca5214eb1a218cc8
2025-03-20HealthFitness: Disable HealthFitness label tests until baseline build catches up Scarlett Song
Recently part of permissions branding in HealthConnect is renamed to HealthFitness. The tests and mainline codes are updated, but the baseline build where the tests are run didn't catch up. To mitigate this issue for FRC date, we will temporarily disable these tests, and re-enable them post FRC when baseline build and HealthFitness mainline modules also catch up. Relnote: N/A Flag: EXEMPT test disabling Bug: 405152547 Bug: 405183811 Change-Id: Ib55b6ab920bef7fd493222b61cfd0d2e8c665bed
2025-03-20Merge "Rename the limited VDM role and permission" into main Vladimir Komsiyski
2025-03-20Fix future assignment in BaseUsePermissionTest Yi-an Chen
Missing the future assignment in BaseUsePermissionTest LOW_COVERAGE_REASON=TEST_ONLY Bug: 403393912 Test: BaseUsePermissionTest Flag: EXEMPT bugfix Relnote: N/A Change-Id: I0c60c8b36425b2b620a43585b452d4d925828a72
2025-03-20Merge "testSendSms requires messaging, not just telephony" into main Treehugger Robot
2025-03-20[automerger skipped] add waitForIdle(timeout) am: a4f5f21095 -s ours am: ↵ Yinchu Chen
2d25842bd7 -s ours am skip reason: Merged-In I107c5a3e2c9e3fce6f68e6cefba0c6133bd547d0 with SHA-1 87bfaa7868 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/Permission/+/3542239 Change-Id: Icff34b9a745c33978fbec0119f450eeab0eb536d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-03-20[automerger skipped] add waitForIdle(timeout) am: a4f5f21095 -s ours Yinchu Chen
am skip reason: Merged-In I107c5a3e2c9e3fce6f68e6cefba0c6133bd547d0 with SHA-1 87bfaa7868 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/Permission/+/3542239 Change-Id: I03e7bce84e9f65524092c38d301859f674ecbd47 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-03-20Merge "Replace flag check to sdk version check" into main Zhi Dou
2025-03-20Merge "Replace flag check to sdk version check" into main Zhi Dou
2025-03-19Merge "Replace flag check to sdk version check" into main Treehugger Robot
2025-03-19[automerger skipped] Merge "Catch runtime exception when telephony is not ↵ Treehugger Robot
available" into main am: 1c54edbffe -s ours am skip reason: Merged-In I1c9c20b259849ba9de39ec2fdfd73b15e017baa0 with SHA-1 044a690fc9 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/Permission/+/3545615 Change-Id: Ibd7a1ef848a48702429de352a4688225356fa579 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-03-19[automerger skipped] Catch runtime exception when telephony is not available ↵ Xiaohui Niu
am: e27a8ccecf -s ours am skip reason: Merged-In I1c9c20b259849ba9de39ec2fdfd73b15e017baa0 with SHA-1 044a690fc9 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/Permission/+/3545615 Change-Id: I3840e363c7e9dc95168a62bad62249ecf7e1af8e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-03-19Merge "Catch runtime exception when telephony is not available" into main Treehugger Robot
2025-03-19Replace flag check to sdk version check Zhi Dou
This change replace flag check to sdk version check to fix the problem that when the new module is installed on the new version of mainline the exported flags will have inconsistent flag value. Test: atest PermissionControllerMockingTests GtsPermissionUiTestCases Bug: 401592182 Flag: EXEMPT remove flag call Relnote: M05 Change-Id: Ieb5245856d0c306870edd4211d206af8f979445f
2025-03-19testSendSms requires messaging, not just telephony Tomasz Wasilczyk
Bug: 403769622 Test: CtsPermissionTestCases:android.permission.cts.NoSystemFunctionPermissionTest#testSendSms Flag: TEST_ONLY Relnote: N/A Change-Id: I4efbfd6fea5f37db26e323245fe70a2e3e532944
2025-03-19add waitForIdle(timeout) am: 87bfaa7868 Yinchu Chen
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Permission/+/3541922 Change-Id: Ibc1586ee9593434cfc3f1a5b0b8d3574579e160f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>