Update B sdk level checks

Replace custom sdk check with SdkLevel

Bug: 372743073
Flag: EXEMPT bugfix
Relnote: N/A
Test: build
Change-Id: Ib2bed2592749a38e9311219fc5dadd919eb46cf1

8 files changed, 11 insertions, 23 deletions

diff --git a/PermissionController/role-controller/java/com/android/role/controller/behavior/v33/CompanionDeviceAppStreamingRoleBehavior.java b/PermissionController/role-controller/java/com/android/role/controller/behavior/v33/CompanionDeviceAppStreamingRoleBehavior.java
index e99ffb58c..85c4be569 100644
--- a/PermissionController/role-controller/java/com/android/role/controller/behavior/v33/CompanionDeviceAppStreamingRoleBehavior.java
+++ b/PermissionController/role-controller/java/com/android/role/controller/behavior/v33/CompanionDeviceAppStreamingRoleBehavior.java
@@ -22,10 +22,10 @@ import android.os.UserHandle;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.android.modules.utils.build.SdkLevel;
 import com.android.role.controller.model.Role;
 import com.android.role.controller.model.RoleBehavior;
 import com.android.role.controller.util.NotificationUtils;
-import com.android.role.controller.util.RoleFlags;
 import com.android.role.controller.util.UserUtils;
 
 /**
@@ -52,6 +52,6 @@ public class CompanionDeviceAppStreamingRoleBehavior implements RoleBehavior {
     @Override
     @Nullable
     public Boolean shouldAllowBypassingQualification(@NonNull Role role, @NonNull Context context) {
-        return !RoleFlags.isAtLeastB();
+        return !SdkLevel.isAtLeastB();
     }
 }
diff --git a/PermissionController/role-controller/java/com/android/role/controller/behavior/v34/CompanionDeviceNearbyDeviceStreamingRoleBehavior.java b/PermissionController/role-controller/java/com/android/role/controller/behavior/v34/CompanionDeviceNearbyDeviceStreamingRoleBehavior.java
index b0f58f40b..f941ec68d 100644
--- a/PermissionController/role-controller/java/com/android/role/controller/behavior/v34/CompanionDeviceNearbyDeviceStreamingRoleBehavior.java
+++ b/PermissionController/role-controller/java/com/android/role/controller/behavior/v34/CompanionDeviceNearbyDeviceStreamingRoleBehavior.java
@@ -21,9 +21,9 @@ import android.content.Context;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.android.modules.utils.build.SdkLevel;
 import com.android.role.controller.model.Role;
 import com.android.role.controller.model.RoleBehavior;
-import com.android.role.controller.util.RoleFlags;
 
 /**
  * Class for behavior of the "Nearby Device Streaming" Companion device profile role.
@@ -33,6 +33,6 @@ public class CompanionDeviceNearbyDeviceStreamingRoleBehavior implements RoleBeh
     @Override
     @Nullable
     public Boolean shouldAllowBypassingQualification(@NonNull Role role, @NonNull Context context) {
-        return !RoleFlags.isAtLeastB();
+        return !SdkLevel.isAtLeastB();
     }
 }
diff --git a/PermissionController/role-controller/java/com/android/role/controller/model/AppOp.java b/PermissionController/role-controller/java/com/android/role/controller/model/AppOp.java
index 99145c747..a0007dcc0 100644
--- a/PermissionController/role-controller/java/com/android/role/controller/model/AppOp.java
+++ b/PermissionController/role-controller/java/com/android/role/controller/model/AppOp.java
@@ -26,7 +26,6 @@ import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
 import com.android.modules.utils.build.SdkLevel;
-import com.android.role.controller.util.RoleFlags;
 import com.android.role.controller.util.PackageUtils;
 
 import java.util.Objects;
@@ -139,7 +138,7 @@ public class AppOp {
         }
         return Build.VERSION.SDK_INT >= mMinSdkVersion
                 // Workaround to match the value 36 for B in roles.xml before SDK finalization.
-                || (mMinSdkVersion == 36 && RoleFlags.isAtLeastB());
+                || (mMinSdkVersion == 36 && SdkLevel.isAtLeastB());
     }
 
     private boolean isAvailableAsUser(@NonNull String packageName,
diff --git a/PermissionController/role-controller/java/com/android/role/controller/model/Permission.java b/PermissionController/role-controller/java/com/android/role/controller/model/Permission.java
index 889f5263d..c3404be8b 100644
--- a/PermissionController/role-controller/java/com/android/role/controller/model/Permission.java
+++ b/PermissionController/role-controller/java/com/android/role/controller/model/Permission.java
@@ -26,7 +26,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.android.modules.utils.build.SdkLevel;
-import com.android.role.controller.util.RoleFlags;
 import com.android.role.controller.util.UserUtils;
 
 import java.util.Objects;
@@ -99,7 +98,7 @@ public class Permission {
         }
         if (Build.VERSION.SDK_INT >= mMinSdkVersion
                 // Workaround to match the value 36 for B in roles.xml before SDK finalization.
-                || (mMinSdkVersion == 36 && RoleFlags.isAtLeastB())) {
+                || (mMinSdkVersion == 36 && SdkLevel.isAtLeastB())) {
             return true;
         }
         if (Build.VERSION.SDK_INT >= mOptionalMinSdkVersion) {
diff --git a/PermissionController/role-controller/java/com/android/role/controller/model/Role.java b/PermissionController/role-controller/java/com/android/role/controller/model/Role.java
index f0df97acc..1b7617b0d 100644
--- a/PermissionController/role-controller/java/com/android/role/controller/model/Role.java
+++ b/PermissionController/role-controller/java/com/android/role/controller/model/Role.java
@@ -501,7 +501,7 @@ public class Role {
         }
         return (Build.VERSION.SDK_INT >= mMinSdkVersion
                 // Workaround to match the value 36 for B in roles.xml before SDK finalization.
-                || (mMinSdkVersion == 36 && RoleFlags.isAtLeastB()))
+                || (mMinSdkVersion == 36 && SdkLevel.isAtLeastB()))
                 && Build.VERSION.SDK_INT <= mMaxSdkVersion;
     }
 
diff --git a/PermissionController/role-controller/java/com/android/role/controller/model/RoleParser.java b/PermissionController/role-controller/java/com/android/role/controller/model/RoleParser.java
index 9c3746b79..f0a730647 100644
--- a/PermissionController/role-controller/java/com/android/role/controller/model/RoleParser.java
+++ b/PermissionController/role-controller/java/com/android/role/controller/model/RoleParser.java
@@ -436,10 +436,9 @@ public class RoleParser {
                     exclusivity = Role.EXCLUSIVITY_USER;
                     break;
                 case EXCLUSIVITY_PROFILE_GROUP:
-                    // TODO(b/372743073): change to isAtLeastB once available
                     // EXCLUSIVITY_PROFILE behavior only available for B+
                     // fallback to default of EXCLUSIVITY_USER
-                    exclusivity = SdkLevel.isAtLeastV()
+                    exclusivity = SdkLevel.isAtLeastB()
                             ? Role.EXCLUSIVITY_PROFILE_GROUP
                             : Role.EXCLUSIVITY_USER;
                     break;
diff --git a/PermissionController/role-controller/java/com/android/role/controller/util/RoleFlags.java b/PermissionController/role-controller/java/com/android/role/controller/util/RoleFlags.java
index 2c5a247b6..23e3a2c65 100644
--- a/PermissionController/role-controller/java/com/android/role/controller/util/RoleFlags.java
+++ b/PermissionController/role-controller/java/com/android/role/controller/util/RoleFlags.java
@@ -20,7 +20,7 @@ import android.os.Build;
 
 import androidx.annotation.ChecksSdkIntAtLeast;
 
-import java.util.Objects;
+import com.android.modules.utils.build.SdkLevel;
 
 /** Util class for getting shared feature flag check logic. */
 public final class RoleFlags {
@@ -32,14 +32,6 @@ public final class RoleFlags {
      */
     @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.BAKLAVA)
     public static boolean isProfileGroupExclusivityAvailable() {
-        // TODO(b/372743073): change to isAtLeastB once available
-        return isAtLeastB() && com.android.permission.flags.Flags.crossUserRoleEnabled();
-    }
-
-    // TODO(b/372743073): remove once SdkLevel.isAtLeastB available
-    @ChecksSdkIntAtLeast(api = 36 /* BUILD_VERSION_CODES.Baklava */)
-    public static boolean isAtLeastB() {
-        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.BAKLAVA
-                || Objects.equals(Build.VERSION.CODENAME, "Baklava");
+        return SdkLevel.isAtLeastB() && com.android.permission.flags.Flags.crossUserRoleEnabled();
     }
 }
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/compat/AppPermissionFragmentCompat.java b/PermissionController/src/com/android/permissioncontroller/permission/compat/AppPermissionFragmentCompat.java
index a5234562b..50e3688e2 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/compat/AppPermissionFragmentCompat.java
+++ b/PermissionController/src/com/android/permissioncontroller/permission/compat/AppPermissionFragmentCompat.java
@@ -33,7 +33,6 @@ import com.android.permission.flags.Flags;
 import com.android.permissioncontroller.R;
 import com.android.permissioncontroller.permission.ui.handheld.max35.LegacyAppPermissionFragment;
 import com.android.permissioncontroller.permission.ui.handheld.v36.AppPermissionFragment;
-import com.android.role.controller.util.RoleFlags;
 
 /** Helper methods for AppPermissionFragment across SDKs for compatibility. */
 public class AppPermissionFragmentCompat {
@@ -45,7 +44,7 @@ public class AppPermissionFragmentCompat {
      */
     @NonNull
     public static PreferenceFragmentCompat createFragment(@NonNull Context context) {
-        if ((RoleFlags.isAtLeastB() && Flags.appPermissionFragmentUsesPreferences())
+        if ((SdkLevel.isAtLeastB() && Flags.appPermissionFragmentUsesPreferences())
                 || (SdkLevel.isAtLeastV() && context.getResources().getBoolean(
                 R.bool.config_usePreferenceForAppPermissionSettings))) {
             return new AppPermissionFragment();