set minSdk for ReservedForTestingProfileGroupExclusivityRole

Bug: 383538899
Flag: EXEMPT bugfix
Relnote: N/A
Test: atest RoleManagerMultiUserTest
Change-Id: I03f3dfd9a6c915c0ec4a95adc559d08de95d4c50

3 files changed, 12 insertions, 5 deletions

diff --git a/PermissionController/res/xml/roles.xml b/PermissionController/res/xml/roles.xml
index 72e1d9654..0f9ff7112 100644
--- a/PermissionController/res/xml/roles.xml
+++ b/PermissionController/res/xml/roles.xml
@@ -1878,19 +1878,20 @@
       -->
     <role
         name="android.app.role.RESERVED_FOR_TESTING_PROFILE_GROUP_EXCLUSIVITY"
-        behavior="ReservedForTestingProfileGroupExclusivityRoleBehavior"
+        behavior="v36.ReservedForTestingProfileGroupExclusivityRoleBehavior"
         description="@string/role_for_testing_profile_group_exclusivity_description"
         exclusive="true"
         exclusivity="profileGroup"
         fallBackToDefaultHolder="true"
         featureFlag="com.android.permission.flags.Flags.crossUserRoleEnabled"
         label="@string/role_for_testing_profile_group_exclusivity_label"
+        minSdkVersion="36"
         requestable="true"
         requestDescription="@string/role_for_testing_profile_group_exclusivity_request_description"
         requestTitle="@string/role_for_testing_profile_group_exclusivity_request_title"
         shortLabel="@string/role_for_testing_profile_group_exclusivity_short_label"
         showNone="true"
-        uiBehavior="ReservedForTestingProfileGroupExclusivityRoleUiBehavior"
+        uiBehavior="v36.ReservedForTestingProfileGroupExclusivityRoleUiBehavior"
         visible="false"/>
 
     <!---
diff --git a/PermissionController/role-controller/java/com/android/role/controller/behavior/ReservedForTestingProfileGroupExclusivityRoleBehavior.java b/PermissionController/role-controller/java/com/android/role/controller/behavior/v36/ReservedForTestingProfileGroupExclusivityRoleBehavior.java
index 5299886f6..e50f33ffd 100644
--- a/PermissionController/role-controller/java/com/android/role/controller/behavior/ReservedForTestingProfileGroupExclusivityRoleBehavior.java
+++ b/PermissionController/role-controller/java/com/android/role/controller/behavior/v36/ReservedForTestingProfileGroupExclusivityRoleBehavior.java
@@ -14,15 +14,17 @@
  * limitations under the License.
  */
 
-package com.android.role.controller.behavior;
+package com.android.role.controller.behavior.v36;
 
 import android.app.role.RoleManager;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
+import android.os.Build;
 import android.os.UserHandle;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 
 import com.android.role.controller.model.Role;
 import com.android.role.controller.model.RoleBehavior;
@@ -33,7 +35,7 @@ import com.android.role.controller.util.UserUtils;
 import java.util.ArrayList;
 import java.util.List;
 
-// TODO(b/383538899): make minSdk36
+@RequiresApi(Build.VERSION_CODES.BAKLAVA)
 public class ReservedForTestingProfileGroupExclusivityRoleBehavior implements RoleBehavior {
     @Nullable
     @Override
diff --git a/PermissionController/src/com/android/permissioncontroller/role/ui/behavior/ReservedForTestingProfileGroupExclusivityRoleUiBehavior.java b/PermissionController/src/com/android/permissioncontroller/role/ui/behavior/v36/ReservedForTestingProfileGroupExclusivityRoleUiBehavior.java
index be51a1e17..00b1ce5b1 100644
--- a/PermissionController/src/com/android/permissioncontroller/role/ui/behavior/ReservedForTestingProfileGroupExclusivityRoleUiBehavior.java
+++ b/PermissionController/src/com/android/permissioncontroller/role/ui/behavior/v36/ReservedForTestingProfileGroupExclusivityRoleUiBehavior.java
@@ -14,23 +14,27 @@
  * limitations under the License.
  */
 
-package com.android.permissioncontroller.role.ui.behavior;
+package com.android.permissioncontroller.role.ui.behavior.v36;
 
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
+import android.os.Build;
 import android.os.UserHandle;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
 import androidx.preference.Preference;
 
 import com.android.permissioncontroller.permission.utils.Utils;
 import com.android.permissioncontroller.role.ui.RequestRoleItemView;
 import com.android.permissioncontroller.role.ui.TwoTargetPreference;
+import com.android.permissioncontroller.role.ui.behavior.RoleUiBehavior;
 import com.android.role.controller.model.Role;
 import com.android.role.controller.util.UserUtils;
 
 import java.util.List;
 
+@RequiresApi(Build.VERSION_CODES.BAKLAVA)
 public class ReservedForTestingProfileGroupExclusivityRoleUiBehavior implements RoleUiBehavior {
     @Override
     public void preparePreferenceAsUser(@NonNull Role role, @NonNull TwoTargetPreference preference,