Merge "Adapt health permission changes to HealthConnect rebranding" into main

2 files changed, 70 insertions, 5 deletions

diff --git a/PermissionController/tests/permissionui/src/com/android/permissioncontroller/permissionui/ui/HealthConnectAllAppPermissionFragmentTest.kt b/PermissionController/tests/permissionui/src/com/android/permissioncontroller/permissionui/ui/HealthConnectAllAppPermissionFragmentTest.kt
index ecc7e161f..10670c5d5 100644
--- a/PermissionController/tests/permissionui/src/com/android/permissioncontroller/permissionui/ui/HealthConnectAllAppPermissionFragmentTest.kt
+++ b/PermissionController/tests/permissionui/src/com/android/permissioncontroller/permissionui/ui/HealthConnectAllAppPermissionFragmentTest.kt
@@ -54,6 +54,11 @@ class HealthConnectAllAppPermissionFragmentTest : BasePermissionUiTest() {
     fun uninstallTestApp() {
         uninstallTestApps()
     }
+
+    @SdkSuppress(
+        minSdkVersion = Build.VERSION_CODES.UPSIDE_DOWN_CAKE,
+        maxSdkVersion = Build.VERSION_CODES.VANILLA_ICE_CREAM,
+    )
     @Test
     fun usedHealthConnectPermissionsAreListed() {
         installTestAppThatUsesHealthConnectPermission()
@@ -67,6 +72,24 @@ class HealthConnectAllAppPermissionFragmentTest : BasePermissionUiTest() {
         }
     }
 
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA, codeName = "Baklava")
+    @Test
+    fun usedHealthConnectPermissionsAreListed_healthFitnessBrand() {
+        installTestAppThatUsesHealthConnectPermission()
+
+        startManageAppPermissionsActivity()
+
+        eventually {
+            waitFindObject(By.text(HEALTH_FITNESS_LABEL))
+            waitFindObject(By.text(HEALTH_CONNECT_PERMISSION_READ_FLOORS_CLIMBED_LABEL))
+            waitFindObject(By.text(HEALTH_CONNECT_PERMISSION_READ_STEPS_LABEL))
+        }
+    }
+
+    @SdkSuppress(
+        minSdkVersion = Build.VERSION_CODES.UPSIDE_DOWN_CAKE,
+        maxSdkVersion = Build.VERSION_CODES.VANILLA_ICE_CREAM,
+    )
     @Test
     fun invalidUngrantedUsedHealthConnectPermissionsAreNotListed() {
         installInvalidTestAppThatUsesHealthConnectPermission()
@@ -78,13 +101,37 @@ class HealthConnectAllAppPermissionFragmentTest : BasePermissionUiTest() {
             assertNull(
                 waitFindObjectOrNull(
                     By.text(HEALTH_CONNECT_PERMISSION_READ_FLOORS_CLIMBED_LABEL),
-                    TIMEOUT_SHORT
+                    TIMEOUT_SHORT,
+                )
+            )
+            assertNull(
+                waitFindObjectOrNull(
+                    By.text(HEALTH_CONNECT_PERMISSION_READ_STEPS_LABEL),
+                    TIMEOUT_SHORT,
+                )
+            )
+        }
+    }
+
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA, codeName = "Baklava")
+    @Test
+    fun invalidUngrantedUsedHealthConnectPermissionsAreNotListed_healthFitnessBrand() {
+        installInvalidTestAppThatUsesHealthConnectPermission()
+
+        startManageAppPermissionsActivity()
+
+        eventually {
+            assertNull(waitFindObjectOrNull(By.text(HEALTH_FITNESS_LABEL), TIMEOUT_SHORT))
+            assertNull(
+                waitFindObjectOrNull(
+                    By.text(HEALTH_CONNECT_PERMISSION_READ_FLOORS_CLIMBED_LABEL),
+                    TIMEOUT_SHORT,
                 )
             )
             assertNull(
                 waitFindObjectOrNull(
                     By.text(HEALTH_CONNECT_PERMISSION_READ_STEPS_LABEL),
-                    TIMEOUT_SHORT
+                    TIMEOUT_SHORT,
                 )
             )
         }
@@ -104,7 +151,7 @@ class HealthConnectAllAppPermissionFragmentTest : BasePermissionUiTest() {
                 }
             },
             Until.newWindow(),
-            TIMEOUT_SHORT
+            TIMEOUT_SHORT,
         )
 
         waitFindObject(By.descContains(MORE_OPTIONS)).click()
@@ -114,6 +161,7 @@ class HealthConnectAllAppPermissionFragmentTest : BasePermissionUiTest() {
     companion object {
         // Health connect label uses a non breaking space
         private const val HEALTH_CONNECT_LABEL = "Health\u00A0Connect"
+        private const val HEALTH_FITNESS_LABEL = "Health, fitness and wellness"
         private const val HEALTH_CONNECT_PERMISSION_READ_FLOORS_CLIMBED =
             "android.permission.health.READ_FLOORS_CLIMBED"
         private const val HEALTH_CONNECT_PERMISSION_READ_FLOORS_CLIMBED_LABEL =
diff --git a/PermissionController/tests/permissionui/src/com/android/permissioncontroller/permissionui/ui/HealthConnectAppPermissionFragmentTest.kt b/PermissionController/tests/permissionui/src/com/android/permissioncontroller/permissionui/ui/HealthConnectAppPermissionFragmentTest.kt
index d4d4be6ec..a0de2f7cd 100644
--- a/PermissionController/tests/permissionui/src/com/android/permissioncontroller/permissionui/ui/HealthConnectAppPermissionFragmentTest.kt
+++ b/PermissionController/tests/permissionui/src/com/android/permissioncontroller/permissionui/ui/HealthConnectAppPermissionFragmentTest.kt
@@ -68,6 +68,10 @@ class HealthConnectAppPermissionFragmentTest : BasePermissionUiTest() {
         uninstallTestApps()
     }
 
+    @SdkSuppress(
+        minSdkVersion = Build.VERSION_CODES.UPSIDE_DOWN_CAKE,
+        maxSdkVersion = Build.VERSION_CODES.VANILLA_ICE_CREAM,
+    )
     @Test
     fun usedHealthConnectPermissionsAreListed_handHeldDevices() {
         assumeFalse(context.packageManager.hasSystemFeature(PackageManager.FEATURE_WATCH))
@@ -78,6 +82,17 @@ class HealthConnectAppPermissionFragmentTest : BasePermissionUiTest() {
         eventually { waitFindObject(By.text(HEALTH_CONNECT_LABEL)) }
     }
 
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA, codeName = "Baklava")
+    @Test
+    fun usedHealthConnectPermissionsAreListed_handHeldDevices_healthFitnessBrand() {
+        assumeFalse(context.packageManager.hasSystemFeature(PackageManager.FEATURE_WATCH))
+        installTestAppThatUsesHealthConnectPermission()
+
+        startManageAppPermissionsActivity()
+
+        eventually { waitFindObject(By.text(HEALTH_FITNESS_LABEL)) }
+    }
+
     @Test
     fun invalidUngrantedUsedHealthConnectPermissionsAreNotListed_handHeldDevices() {
         assumeFalse(context.packageManager.hasSystemFeature(PackageManager.FEATURE_WATCH))
@@ -86,6 +101,7 @@ class HealthConnectAppPermissionFragmentTest : BasePermissionUiTest() {
         startManageAppPermissionsActivity()
 
         waitUntilObjectGone(By.text(HEALTH_CONNECT_LABEL), TIMEOUT_SHORT)
+        waitUntilObjectGone(By.text(HEALTH_FITNESS_LABEL), TIMEOUT_SHORT)
     }
 
     @SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA, codeName = "Baklava")
@@ -121,7 +137,7 @@ class HealthConnectAppPermissionFragmentTest : BasePermissionUiTest() {
 
         startManageAppPermissionsActivity()
 
-        eventually { waitFindObject(By.text(HEALTH_CONNECT_LABEL)) }
+        eventually { waitFindObject(By.text(HEALTH_FITNESS_LABEL)) }
     }
 
     @SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA, codeName = "Baklava")
@@ -133,7 +149,7 @@ class HealthConnectAppPermissionFragmentTest : BasePermissionUiTest() {
 
         startManageAppPermissionsActivity()
 
-        waitUntilObjectGone(By.text(HEALTH_CONNECT_LABEL), TIMEOUT_SHORT)
+        waitUntilObjectGone(By.text(HEALTH_FITNESS_LABEL), TIMEOUT_SHORT)
     }
 
     private fun startManageAppPermissionsActivity() {
@@ -152,6 +168,7 @@ class HealthConnectAppPermissionFragmentTest : BasePermissionUiTest() {
         private const val FITNESS_AND_WELLNESS_LABEL = "Fitness and wellness"
         // Health connect label uses a non breaking space
         private const val HEALTH_CONNECT_LABEL = "Health\u00A0Connect"
+        private const val HEALTH_FITNESS_LABEL = "Health, fitness and wellness"
         private const val HEALTH_CONNECT_PERMISSION_READ_FLOORS_CLIMBED =
             "android.permission.health.READ_FLOORS_CLIMBED"