Merge "Revert "Add BackgroundPermission cts test for health permissions"" into main

1 files changed, 2 insertions, 32 deletions

diff --git a/tests/cts/permission/src/android/permission/cts/BackgroundPermissionsTest.java b/tests/cts/permission/src/android/permission/cts/BackgroundPermissionsTest.java
index 6c08f75ff..f3f47631c 100644
--- a/tests/cts/permission/src/android/permission/cts/BackgroundPermissionsTest.java
+++ b/tests/cts/permission/src/android/permission/cts/BackgroundPermissionsTest.java
@@ -24,7 +24,6 @@ import static android.app.AppOpsManager.MODE_FOREGROUND;
 import static android.app.AppOpsManager.MODE_IGNORED;
 import static android.content.pm.PermissionInfo.PROTECTION_DANGEROUS;
 import static android.content.pm.PermissionInfo.PROTECTION_INTERNAL;
-import static android.health.connect.HealthPermissions.HEALTH_PERMISSION_GROUP;
 import static android.permission.cts.PermissionUtils.getAppOp;
 import static android.permission.cts.PermissionUtils.grantPermission;
 import static android.permission.cts.PermissionUtils.install;
@@ -32,10 +31,8 @@ import static android.permission.cts.PermissionUtils.uninstallApp;
 
 import static com.android.compatibility.common.util.SystemUtil.eventually;
 
-import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
 
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -45,13 +42,8 @@ import android.app.UiAutomation;
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import android.content.pm.PermissionGroupInfo;
 import android.content.pm.PermissionInfo;
-import android.permission.flags.Flags;
 import android.platform.test.annotations.AppModeFull;
-import android.platform.test.annotations.RequiresFlagsEnabled;
-import android.platform.test.flag.junit.CheckFlagsRule;
-import android.platform.test.flag.junit.DeviceFlagsValueProvider;
 import android.util.ArrayMap;
 import android.util.Log;
 
@@ -59,7 +51,6 @@ import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.After;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -81,9 +72,6 @@ public class BackgroundPermissionsTest {
     private static final UiAutomation sUiAutomation =
             InstrumentationRegistry.getInstrumentation().getUiAutomation();
 
-    @Rule
-    public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();
-
     @After
     public void uninstallTestApp() {
         uninstallApp(APP_PKG);
@@ -91,23 +79,9 @@ public class BackgroundPermissionsTest {
 
     @Test
     @AppModeFull(reason = "Instant apps cannot read properties of other packages")
-    public void verifyBackgroundPropertiesForPlatformPermissions() throws Exception {
-        verifyBackgroundPermissionsProperties("android");
-    }
-
-    @RequiresFlagsEnabled({Flags.FLAG_REPLACE_BODY_SENSOR_PERMISSION_ENABLED})
-    @Test
-    @AppModeFull(reason = "Instant apps cannot read properties of other packages")
-    public void verifyBackgroundPropertiesForHealthPermissions() throws Exception {
-        String healthPackageName = sContext.getPackageManager().getPermissionGroupInfo(
-            HEALTH_PERMISSION_GROUP, /* flags= */ 0).packageName;
-        verifyBackgroundPermissionsProperties(healthPackageName);
-    }
-
-    private void verifyBackgroundPermissionsProperties(String packageName)
-        throws Exception {
+    public void verifybackgroundPermissionsProperties() throws Exception {
         PackageInfo pkg = sContext.getPackageManager().getPackageInfo(
-                packageName, PackageManager.GET_PERMISSIONS);
+                "android", PackageManager.GET_PERMISSIONS);
         ArrayMap<String, String> potentialBackgroundPermissionsToGroup = new ArrayMap<>();
 
         int numPermissions = pkg.permissions.length;
@@ -123,13 +97,11 @@ public class BackgroundPermissionsTest {
             }
         }
 
-        int backgroundPermissionCount = 0;
         for (int i = 0; i < numPermissions; i++) {
             PermissionInfo permission = pkg.permissions[i];
             String backgroundPermissionName = permission.backgroundPermission;
 
             if (backgroundPermissionName != null) {
-                backgroundPermissionCount += 1;
                 Log.i(LOG_TAG, permission.name + "->" + backgroundPermissionName);
 
                 // foreground permissions must be dangerous
@@ -143,8 +115,6 @@ public class BackgroundPermissionsTest {
                         .containsKey(backgroundPermissionName));
             }
         }
-        // Tested packages must have at least one permission linked with a background permission.
-        assertThat(backgroundPermissionCount).isGreaterThan(0);
     }
 
     /**