diff options
| -rw-r--r-- | PermissionController/res/xml/roles.xml | 6 | ||||
| -rw-r--r-- | flags/flags.aconfig | 9 | ||||
| -rw-r--r-- | tests/cts/permissionui/src/android/permissionui/cts/PermissionReviewTapjackingTest.kt | 2 |
3 files changed, 16 insertions, 1 deletions
diff --git a/PermissionController/res/xml/roles.xml b/PermissionController/res/xml/roles.xml index fafe0f553..b067c41b5 100644 --- a/PermissionController/res/xml/roles.xml +++ b/PermissionController/res/xml/roles.xml @@ -1626,6 +1626,12 @@ <permission-set name="location" /> <permission name="android.permission.ACCESS_BACKGROUND_LOCATION" /> <permission name="android.permission.ACTIVITY_RECOGNITION" /> + <permission + name="android.permission.health.READ_HEART_RATE" + featureFlag="android.permission.flags.Flags.replaceBodySensorPermissionEnabled" /> + <permission + name="android.permission.health.READ_HEALTH_DATA_IN_BACKGROUND" + featureFlag="android.permission.flags.Flags.replaceBodySensorPermissionEnabled" /> </permissions> </role> diff --git a/flags/flags.aconfig b/flags/flags.aconfig index d130f05e2..6d503cafb 100644 --- a/flags/flags.aconfig +++ b/flags/flags.aconfig @@ -110,6 +110,15 @@ flag { } flag { + name: "cross_user_role_enabled" + is_exported: true + namespace: "permissions" + description: "This flag enables cross-user roles support and API" + bug: "367732307" + is_fixed_read_only: true +} + +flag { name: "permission_timeline_attribution_label_fix" is_exported: true namespace: "permissions" diff --git a/tests/cts/permissionui/src/android/permissionui/cts/PermissionReviewTapjackingTest.kt b/tests/cts/permissionui/src/android/permissionui/cts/PermissionReviewTapjackingTest.kt index 14901eb2a..95050ab3e 100644 --- a/tests/cts/permissionui/src/android/permissionui/cts/PermissionReviewTapjackingTest.kt +++ b/tests/cts/permissionui/src/android/permissionui/cts/PermissionReviewTapjackingTest.kt @@ -44,7 +44,7 @@ class PermissionReviewTapjackingTest : BaseUsePermissionTest() { installPackage(APP_APK_PATH_22) installPackage(HELPER_APP_OVERLAY) - Thread.sleep(1000) + SystemUtil.waitForBroadcasts() SystemUtil.runShellCommandOrThrow( "appops set $HELPER_PACKAGE_NAME android:system_alert_window allow" |