1 files changed, 19 insertions, 4 deletions
diff --git a/src/com/android/packageinstaller/permission/ui/ManagePermissionsActivity.java b/src/com/android/packageinstaller/permission/ui/ManagePermissionsActivity.java
index f7fcec5e..38dbf8f5 100644
--- a/src/com/android/packageinstaller/permission/ui/ManagePermissionsActivity.java
+++ b/src/com/android/packageinstaller/permission/ui/ManagePermissionsActivity.java
@@ -40,7 +40,13 @@ public final class ManagePermissionsActivity extends OverlayTouchActivity {
 
         switch (action) {
             case Intent.ACTION_MANAGE_PERMISSIONS: {
-                fragment = ManagePermissionsFragment.newInstance();
+                if (DeviceUtils.isTelevision(this)) {
+                    fragment = com.android.packageinstaller.permission.ui.television
+                            .ManagePermissionsFragment.newInstance();
+                } else {
+                    fragment = com.android.packageinstaller.permission.ui.handheld
+                            .ManagePermissionsFragment.newInstance();
+                }
             } break;
 
             case Intent.ACTION_MANAGE_APP_PERMISSIONS: {
@@ -50,11 +56,14 @@ public final class ManagePermissionsActivity extends OverlayTouchActivity {
                     finish();
                     return;
                 }
-
                 if (DeviceUtils.isWear(this)) {
                     fragment = AppPermissionsFragmentWear.newInstance(packageName);
+                } else if (DeviceUtils.isTelevision(this)) {
+                    fragment = com.android.packageinstaller.permission.ui.television
+                            .AppPermissionsFragment.newInstance(packageName);
                 } else {
-                    fragment = AppPermissionsFragment.newInstance(packageName);
+                    fragment = com.android.packageinstaller.permission.ui.handheld
+                            .AppPermissionsFragment.newInstance(packageName);
                 }
             } break;
 
@@ -65,7 +74,13 @@ public final class ManagePermissionsActivity extends OverlayTouchActivity {
                     finish();
                     return;
                 }
-                fragment = PermissionAppsFragment.newInstance(permissionName);
+                if (DeviceUtils.isTelevision(this)) {
+                    fragment = com.android.packageinstaller.permission.ui.television
+                            .PermissionAppsFragment.newInstance(permissionName);
+                } else {
+                    fragment = com.android.packageinstaller.permission.ui.handheld
+                            .PermissionAppsFragment.newInstance(permissionName);
+                }
             } break;
 
             default: {