Merge "API tests fail when flag off due to method not being found" into main

1 files changed, 0 insertions, 42 deletions

diff --git a/tests/cts/role/src/android/app/role/cts/RoleManagerTest.java b/tests/cts/role/src/android/app/role/cts/RoleManagerTest.java
index f26bc0eb5..c55fbf779 100644
--- a/tests/cts/role/src/android/app/role/cts/RoleManagerTest.java
+++ b/tests/cts/role/src/android/app/role/cts/RoleManagerTest.java
@@ -1402,16 +1402,6 @@ public class RoleManagerTest {
         });
     }
 
-    @RequiresFlagsDisabled(com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED)
-    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA, codeName = "Baklava")
-    @Test
-    public void cannotGetDefaultHoldersForTestFlagDisabled() throws Exception {
-        runWithShellPermissionIdentity(() -> {
-            assertThrows(IllegalStateException.class, () ->
-                    sRoleManager.getDefaultHoldersForTest(PROFILE_GROUP_EXCLUSIVE_ROLE_NAME));
-        });
-    }
-
     @RequiresFlagsEnabled(com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED)
     @SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA, codeName = "Baklava")
     @Test
@@ -1441,18 +1431,6 @@ public class RoleManagerTest {
         });
     }
 
-    @RequiresFlagsDisabled(com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED)
-    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA, codeName = "Baklava")
-    @Test
-    public void cannotSetDefaultHoldersForTestFlagDisabled() throws Exception {
-        List<String> testRoleHolders = List.of("a", "b", "c");
-        runWithShellPermissionIdentity(() -> {
-            assertThrows(IllegalStateException.class, () ->
-                    sRoleManager.setDefaultHoldersForTest(PROFILE_GROUP_EXCLUSIVE_ROLE_NAME,
-                            testRoleHolders));
-        });
-    }
-
     @RequiresFlagsEnabled(com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED)
     @SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA, codeName = "Baklava")
     @Test
@@ -1528,16 +1506,6 @@ public class RoleManagerTest {
         });
     }
 
-    @RequiresFlagsDisabled(com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED)
-    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA, codeName = "Baklava")
-    @Test
-    public void cannotGetIsRoleVisibleForTestFlagDisabled() throws Exception {
-        runWithShellPermissionIdentity(() -> {
-            assertThrows(IllegalStateException.class, () ->
-                    sRoleManager.isRoleVisibleForTest(PROFILE_GROUP_EXCLUSIVE_ROLE_NAME));
-        });
-    }
-
     @RequiresFlagsEnabled(com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED)
     @SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA, codeName = "Baklava")
     @Test
@@ -1566,16 +1534,6 @@ public class RoleManagerTest {
         });
     }
 
-    @RequiresFlagsDisabled(com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED)
-    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA, codeName = "Baklava")
-    @Test
-    public void cannotSetRoleVisibleForTestFlagDisabled() throws Exception {
-        runWithShellPermissionIdentity(() -> {
-            assertThrows(IllegalStateException.class, () ->
-                    sRoleManager.setRoleVisibleForTest(PROFILE_GROUP_EXCLUSIVE_ROLE_NAME, false));
-        });
-    }
-
     @RequiresFlagsEnabled(com.android.permission.flags.Flags.FLAG_CROSS_USER_ROLE_ENABLED)
     @SdkSuppress(minSdkVersion = Build.VERSION_CODES.BAKLAVA, codeName = "Baklava")
     @Test