17 files changed, 35 insertions, 33 deletions
diff --git a/PermissionController/AndroidManifest.xml b/PermissionController/AndroidManifest.xml
index 4bd7720d0..0d2ad53f0 100644
--- a/PermissionController/AndroidManifest.xml
+++ b/PermissionController/AndroidManifest.xml
@@ -487,7 +487,7 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="com.android.permissioncontroller.role.ui.ChangeDefaultCardEmulationActivity"
+        <activity android:name="com.android.permissioncontroller.role.ui.v35.ChangeDefaultCardEmulationActivity"
             android:enabled="@bool/is_at_least_v"
             android:excludeFromRecents="true"
             android:noHistory="true"
diff --git a/PermissionController/res/xml/roles.xml b/PermissionController/res/xml/roles.xml
index 4e3a40ecf..298e42e1e 100644
--- a/PermissionController/res/xml/roles.xml
+++ b/PermissionController/res/xml/roles.xml
@@ -522,7 +522,7 @@
 
     <role
         name="android.app.role.SYSTEM_AUTOMOTIVE_CLUSTER"
-        behavior="AutomotiveRoleBehavior"
+        behavior="v31.AutomotiveRoleBehavior"
         defaultHolders="config_systemAutomotiveCluster"
         exclusive="true"
         minSdkVersion="31"
@@ -539,7 +539,7 @@
 
     <role
         name="android.app.role.COMPANION_DEVICE_WATCH"
-        behavior="CompanionDeviceWatchRoleBehavior"
+        behavior="v31.CompanionDeviceWatchRoleBehavior"
         description="@string/role_watch_description"
         exclusive="false"
         minSdkVersion="31"
@@ -598,7 +598,7 @@
 
     <role
         name="android.app.role.SYSTEM_SHELL"
-        behavior="SystemShellRoleBehavior"
+        behavior="v31.SystemShellRoleBehavior"
         defaultHolders="config_systemShell"
         exclusive="true"
         minSdkVersion="31"
@@ -771,7 +771,7 @@
       -->
     <role
         name="android.app.role.SYSTEM_TELEVISION_NOTIFICATION_HANDLER"
-        behavior="TelevisionRoleBehavior"
+        behavior="v31.TelevisionRoleBehavior"
         defaultHolders="config_systemTelevisionNotificationHandler"
         exclusive="true"
         minSdkVersion="31"
@@ -1074,7 +1074,7 @@
     -->
     <role
         name="android.app.role.SYSTEM_DOCUMENT_MANAGER"
-        behavior="DocumentManagerRoleBehavior"
+        behavior="v33.DocumentManagerRoleBehavior"
         exclusive="true"
         minSdkVersion="33"
         static="true"
@@ -1147,7 +1147,7 @@
       -->
     <role
         name="android.app.role.SYSTEM_TELEVISION_REMOTE_SERVICE"
-        behavior="TelevisionRoleBehavior"
+        behavior="v31.TelevisionRoleBehavior"
         defaultHolders="config_systemTelevisionRemoteService"
         exclusive="true"
         minSdkVersion="31"
@@ -1166,7 +1166,7 @@
     <role
         name="android.app.role.COMPANION_DEVICE_APP_STREAMING"
         allowBypassingQualification="true"
-        behavior="CompanionDeviceAppStreamingRoleBehavior"
+        behavior="v33.CompanionDeviceAppStreamingRoleBehavior"
         description="@string/role_app_streaming_description"
         exclusive="false"
         minSdkVersion="33"
@@ -1192,7 +1192,7 @@
     <role
         name="android.app.role.COMPANION_DEVICE_COMPUTER"
         allowBypassingQualification="true"
-        behavior="CompanionDeviceComputerRoleBehavior"
+        behavior="v33.CompanionDeviceComputerRoleBehavior"
         description="@string/role_companion_device_computer_description"
         exclusive="false"
         minSdkVersion="33"
@@ -1209,7 +1209,7 @@
 
     <role
         name="android.app.role.COMPANION_DEVICE_GLASSES"
-        behavior="CompanionDeviceGlassesRoleBehavior"
+        behavior="v34.CompanionDeviceGlassesRoleBehavior"
         exclusive="false"
         minSdkVersion="34"
         systemOnly="false"
@@ -1268,7 +1268,7 @@
       -->
     <role
         name="android.app.role.DEVICE_POLICY_MANAGEMENT"
-        behavior="DevicePolicyManagementRoleBehavior"
+        behavior="v33.DevicePolicyManagementRoleBehavior"
         defaultHolders="config_devicePolicyManagement"
         exclusive="true"
         minSdkVersion="33"
@@ -1394,7 +1394,7 @@
       -->
     <role
         name="android.app.role.SYSTEM_AUTOMOTIVE_CALENDAR_SYNC_MANAGER"
-        behavior="AutomotiveRoleBehavior"
+        behavior="v31.AutomotiveRoleBehavior"
         defaultHolders="config_systemAutomotiveCalendarSyncManager"
         exclusive="true"
         minSdkVersion="33"
@@ -1414,7 +1414,7 @@
       -->
     <role
         name="android.app.role.AUTOMOTIVE_NAVIGATION"
-        behavior="AutomotiveRoleBehavior"
+        behavior="v31.AutomotiveRoleBehavior"
         defaultHolders="config_defaultAutomotiveNavigation"
         description="@string/role_automotive_navigation_description"
         exclusive="true"
@@ -1571,7 +1571,7 @@
     -->
     <role
         name="android.app.role.SYSTEM_WEAR_HEALTH_SERVICE"
-        behavior="SystemWearHealthServiceRoleBehavior"
+        behavior="v33.SystemWearHealthServiceRoleBehavior"
         defaultHolders="config_systemWearHealthService"
         exclusive="true"
         minSdkVersion="33"
@@ -1591,7 +1591,7 @@
     -->
     <role
         name="android.app.role.NOTES"
-        behavior="NotesRoleBehavior"
+        behavior="v34.NotesRoleBehavior"
         defaultHolders="config_defaultNotes"
         description="@string/role_notes_description"
         exclusive="true"
@@ -1655,7 +1655,7 @@
 
     <role
         name="android.app.role.RETAIL_DEMO"
-        behavior="RetailDemoRoleBehavior"
+        behavior="v35.RetailDemoRoleBehavior"
         defaultHolders="config_defaultRetailDemo"
         exclusive="true"
         minSdkVersion="35"
@@ -1680,7 +1680,7 @@
 
     <role
         name="android.app.role.WALLET"
-        behavior="WalletRoleBehavior"
+        behavior="v35.WalletRoleBehavior"
         defaultHolders="config_defaultWallet"
         description="@string/role_wallet_description"
         exclusive="true"
@@ -1692,7 +1692,7 @@
         requestTitle="@string/role_wallet_request_title"
         showNone="true"
         shortLabel="@string/role_wallet_short_label"
-        uiBehavior="WalletRoleUiBehavior"/>
+        uiBehavior="v35.WalletRoleUiBehavior"/>
 
 
 </roles>
diff --git a/PermissionController/role-controller/java/com/android/role/controller/behavior/AutomotiveRoleBehavior.java b/PermissionController/role-controller/java/com/android/role/controller/behavior/v31/AutomotiveRoleBehavior.java
index 6eedb8f4d..022e127e6 100644
--- a/PermissionController/role-controller/java/com/android/role/controller/behavior/AutomotiveRoleBehavior.java
+++ b/PermissionController/role-controller/java/com/android/role/controller/behavior/v31/AutomotiveRoleBehavior.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.role.controller.behavior;
+package com.android.role.controller.behavior.v31;
 
 import android.content.Context;
 import android.content.pm.PackageManager;
diff --git a/PermissionController/role-controller/java/com/android/role/controller/behavior/CompanionDeviceWatchRoleBehavior.java b/PermissionController/role-controller/java/com/android/role/controller/behavior/v31/CompanionDeviceWatchRoleBehavior.java
index 0645c84d1..b98035fb2 100644
--- a/PermissionController/role-controller/java/com/android/role/controller/behavior/CompanionDeviceWatchRoleBehavior.java
+++ b/PermissionController/role-controller/java/com/android/role/controller/behavior/v31/CompanionDeviceWatchRoleBehavior.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.role.controller.behavior;
+package com.android.role.controller.behavior.v31;
 
 import android.content.Context;
 import android.os.UserHandle;
diff --git a/PermissionController/role-controller/java/com/android/role/controller/behavior/SystemShellRoleBehavior.java b/PermissionController/role-controller/java/com/android/role/controller/behavior/v31/SystemShellRoleBehavior.java
index 621955770..8c6eafa26 100644
--- a/PermissionController/role-controller/java/com/android/role/controller/behavior/SystemShellRoleBehavior.java
+++ b/PermissionController/role-controller/java/com/android/role/controller/behavior/v31/SystemShellRoleBehavior.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.role.controller.behavior;
+package com.android.role.controller.behavior.v31;
 
 import android.content.Context;
 import android.content.pm.PackageManager;
diff --git a/PermissionController/role-controller/java/com/android/role/controller/behavior/TelevisionRoleBehavior.java b/PermissionController/role-controller/java/com/android/role/controller/behavior/v31/TelevisionRoleBehavior.java
index 88021e62d..d418ba300 100644
--- a/PermissionController/role-controller/java/com/android/role/controller/behavior/TelevisionRoleBehavior.java
+++ b/PermissionController/role-controller/java/com/android/role/controller/behavior/v31/TelevisionRoleBehavior.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.role.controller.behavior;
+package com.android.role.controller.behavior.v31;
 
 import android.content.Context;
 import android.content.pm.PackageManager;
diff --git a/PermissionController/role-controller/java/com/android/role/controller/behavior/CompanionDeviceAppStreamingRoleBehavior.java b/PermissionController/role-controller/java/com/android/role/controller/behavior/v33/CompanionDeviceAppStreamingRoleBehavior.java
index c164de3d8..275387d57 100644
--- a/PermissionController/role-controller/java/com/android/role/controller/behavior/CompanionDeviceAppStreamingRoleBehavior.java
+++ b/PermissionController/role-controller/java/com/android/role/controller/behavior/v33/CompanionDeviceAppStreamingRoleBehavior.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.role.controller.behavior;
+package com.android.role.controller.behavior.v33;
 
 import android.content.Context;
 import android.os.UserHandle;
diff --git a/PermissionController/role-controller/java/com/android/role/controller/behavior/CompanionDeviceComputerRoleBehavior.java b/PermissionController/role-controller/java/com/android/role/controller/behavior/v33/CompanionDeviceComputerRoleBehavior.java
index e5d996675..9967751ed 100644
--- a/PermissionController/role-controller/java/com/android/role/controller/behavior/CompanionDeviceComputerRoleBehavior.java
+++ b/PermissionController/role-controller/java/com/android/role/controller/behavior/v33/CompanionDeviceComputerRoleBehavior.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.role.controller.behavior;
+package com.android.role.controller.behavior.v33;
 
 import android.content.Context;
 import android.os.UserHandle;
diff --git a/PermissionController/role-controller/java/com/android/role/controller/behavior/DevicePolicyManagementRoleBehavior.java b/PermissionController/role-controller/java/com/android/role/controller/behavior/v33/DevicePolicyManagementRoleBehavior.java
index 648b7d198..34e7e1843 100644
--- a/PermissionController/role-controller/java/com/android/role/controller/behavior/DevicePolicyManagementRoleBehavior.java
+++ b/PermissionController/role-controller/java/com/android/role/controller/behavior/v33/DevicePolicyManagementRoleBehavior.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.role.controller.behavior;
+package com.android.role.controller.behavior.v33;
 
 import android.app.admin.DevicePolicyManager;
 import android.content.Context;
diff --git a/PermissionController/role-controller/java/com/android/role/controller/behavior/DocumentManagerRoleBehavior.java b/PermissionController/role-controller/java/com/android/role/controller/behavior/v33/DocumentManagerRoleBehavior.java
index fa030a00a..3fb7b2c56 100644
--- a/PermissionController/role-controller/java/com/android/role/controller/behavior/DocumentManagerRoleBehavior.java
+++ b/PermissionController/role-controller/java/com/android/role/controller/behavior/v33/DocumentManagerRoleBehavior.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.role.controller.behavior;
+package com.android.role.controller.behavior.v33;
 
 import android.content.Context;
 import android.os.UserHandle;
diff --git a/PermissionController/role-controller/java/com/android/role/controller/behavior/SystemWearHealthServiceRoleBehavior.java b/PermissionController/role-controller/java/com/android/role/controller/behavior/v33/SystemWearHealthServiceRoleBehavior.java
index d9f34291d..446bdac84 100644
--- a/PermissionController/role-controller/java/com/android/role/controller/behavior/SystemWearHealthServiceRoleBehavior.java
+++ b/PermissionController/role-controller/java/com/android/role/controller/behavior/v33/SystemWearHealthServiceRoleBehavior.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.role.controller.behavior;
+package com.android.role.controller.behavior.v33;
 
 import android.content.Context;
 import android.content.pm.PackageManager;
diff --git a/PermissionController/role-controller/java/com/android/role/controller/behavior/CompanionDeviceGlassesRoleBehavior.java b/PermissionController/role-controller/java/com/android/role/controller/behavior/v34/CompanionDeviceGlassesRoleBehavior.java
index 5464a1518..00d7e5f31 100644
--- a/PermissionController/role-controller/java/com/android/role/controller/behavior/CompanionDeviceGlassesRoleBehavior.java
+++ b/PermissionController/role-controller/java/com/android/role/controller/behavior/v34/CompanionDeviceGlassesRoleBehavior.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.role.controller.behavior;
+package com.android.role.controller.behavior.v34;
 
 import android.content.Context;
 import android.os.UserHandle;
diff --git a/PermissionController/role-controller/java/com/android/role/controller/behavior/NotesRoleBehavior.java b/PermissionController/role-controller/java/com/android/role/controller/behavior/v34/NotesRoleBehavior.java
index 14c189a0f..4e39e0c87 100644
--- a/PermissionController/role-controller/java/com/android/role/controller/behavior/NotesRoleBehavior.java
+++ b/PermissionController/role-controller/java/com/android/role/controller/behavior/v34/NotesRoleBehavior.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.role.controller.behavior;
+package com.android.role.controller.behavior.v34;
 
 import android.content.Context;
 import android.content.res.Resources;
diff --git a/PermissionController/role-controller/java/com/android/role/controller/behavior/RetailDemoRoleBehavior.java b/PermissionController/role-controller/java/com/android/role/controller/behavior/v35/RetailDemoRoleBehavior.java
index 6dcdafd4c..9905ed0ae 100644
--- a/PermissionController/role-controller/java/com/android/role/controller/behavior/RetailDemoRoleBehavior.java
+++ b/PermissionController/role-controller/java/com/android/role/controller/behavior/v35/RetailDemoRoleBehavior.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.role.controller.behavior;
+package com.android.role.controller.behavior.v35;
 
 import android.app.admin.DevicePolicyManager;
 import android.content.Context;
diff --git a/PermissionController/role-controller/java/com/android/role/controller/behavior/WalletRoleBehavior.java b/PermissionController/role-controller/java/com/android/role/controller/behavior/v35/WalletRoleBehavior.java
index 855012cf1..d01e59456 100644
--- a/PermissionController/role-controller/java/com/android/role/controller/behavior/WalletRoleBehavior.java
+++ b/PermissionController/role-controller/java/com/android/role/controller/behavior/v35/WalletRoleBehavior.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.role.controller.behavior;
+package com.android.role.controller.behavior.v35;
 
 import android.content.ComponentName;
 import android.content.Context;
diff --git a/PermissionController/src/com/android/permissioncontroller/role/ui/behavior/WalletRoleUiBehavior.java b/PermissionController/src/com/android/permissioncontroller/role/ui/behavior/v35/WalletRoleUiBehavior.java
index 5c0618724..aa6194997 100644
--- a/PermissionController/src/com/android/permissioncontroller/role/ui/behavior/WalletRoleUiBehavior.java
+++ b/PermissionController/src/com/android/permissioncontroller/role/ui/behavior/v35/WalletRoleUiBehavior.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.permissioncontroller.role.ui.behavior;
+package com.android.permissioncontroller.role.ui.behavior.v35;
 
 import android.content.Context;
 import android.content.Intent;
@@ -38,6 +38,7 @@ import androidx.core.util.Pair;
 import androidx.preference.Preference;
 
 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;
 
diff --git a/PermissionController/src/com/android/permissioncontroller/role/ui/ChangeDefaultCardEmulationActivity.java b/PermissionController/src/com/android/permissioncontroller/role/ui/v35/ChangeDefaultCardEmulationActivity.java
index 882d01c56..e1f92e2d3 100644
--- a/PermissionController/src/com/android/permissioncontroller/role/ui/ChangeDefaultCardEmulationActivity.java
+++ b/PermissionController/src/com/android/permissioncontroller/role/ui/v35/ChangeDefaultCardEmulationActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.permissioncontroller.role.ui;
+package com.android.permissioncontroller.role.ui.v35;
 
 import android.app.Activity;
 import android.app.role.RoleManager;
@@ -30,6 +30,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.android.modules.utils.build.SdkLevel;
+import com.android.permissioncontroller.role.ui.DefaultAppActivity;
 
 import java.util.List;
 import java.util.Objects;