summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Scarlett Song <scarlettsong@google.com> 2024-10-16 00:49:04 +0000
committer Scarlett Song <scarlettsong@google.com> 2024-11-07 14:52:14 +0000
commit454a679a0977669743d1035d2708c731f43e56b0 (patch)
treec8c494a3732fd0c963722839bb7a9d3bf0a8ef22
parent6f4beaa713761ffcee0ba10f7931ada424195938 (diff)
Health: Enabled HealthConnect PermissionManager on Wear behind flag
In go/ah-permissions-figma, on Wear when user clicks into Settings->App&Notification->App Permissions->HealthConnect, we want to do redirect to HealthConnect PermissionManager UI page. The jump is already defined in Utils, this CL is to enable the HealthConnect Chip show up in "App Permissions" page. Test: https://screenshot.googleplex.com/6RjEjpxKVPyMG2a, https://screenshot.googleplex.com/9RorizJpRyCSANh Bug: 364638912 Bug: 364643019 Flag: android.permission.flags.replace_body_sensor_permission_enabled Relnote: Granular health permission on Wear Change-Id: I1892fa70ee49108ddbdbaa73080429b90a37c3be
-rw-r--r--PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearManageStandardPermissionScreen.kt9
1 files changed, 8 insertions, 1 deletions
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearManageStandardPermissionScreen.kt b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearManageStandardPermissionScreen.kt
index bd1946759..9aacd65d3 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearManageStandardPermissionScreen.kt
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/wear/WearManageStandardPermissionScreen.kt
@@ -17,6 +17,7 @@
package com.android.permissioncontroller.permission.ui.wear
import android.graphics.drawable.Drawable
+import android.permission.flags.Flags
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.livedata.observeAsState
@@ -77,7 +78,13 @@ internal fun getPermGroupChipParams(
}
return permissionGroups
// Removing Health Connect from the list of permissions to fix b/331260850
- .filterNot { Utils.isHealthPermissionGroup(it.key) }
+ .let {
+ if (Flags.replaceBodySensorPermissionEnabled()) {
+ it
+ } else {
+ it.filterNot { Utils.isHealthPermissionGroup(it.key) }
+ }
+ }
.mapNotNull {
val uiInfo = it.value ?: return@mapNotNull null
PermGroupChipParam(