1 files changed, 22 insertions, 3 deletions
diff --git a/src/com/android/packageinstaller/permission/ui/ManagePermissionsActivity.java b/src/com/android/packageinstaller/permission/ui/ManagePermissionsActivity.java
index 8ba6b127..f5703564 100644
--- a/src/com/android/packageinstaller/permission/ui/ManagePermissionsActivity.java
+++ b/src/com/android/packageinstaller/permission/ui/ManagePermissionsActivity.java
@@ -20,6 +20,7 @@ import android.app.Fragment;
 import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
+import com.android.packageinstaller.permission.utils.Utils;
 
 public final class ManagePermissionsActivity extends OverlayTouchActivity {
     private static final String LOG_TAG = "ManagePermissionsActivity";
@@ -37,7 +38,13 @@ public final class ManagePermissionsActivity extends OverlayTouchActivity {
 
         switch (action) {
             case Intent.ACTION_MANAGE_PERMISSIONS: {
-                fragment = ManagePermissionsFragment.newInstance();
+                if (Utils.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: {
@@ -47,7 +54,13 @@ public final class ManagePermissionsActivity extends OverlayTouchActivity {
                     finish();
                     return;
                 }
-                fragment = AppPermissionsFragment.newInstance(packageName);
+                if (Utils.isTelevision(this)) {
+                    fragment = com.android.packageinstaller.permission.ui.television
+                            .AppPermissionsFragment.newInstance(packageName);
+                } else {
+                    fragment = com.android.packageinstaller.permission.ui.handheld
+                            .AppPermissionsFragment.newInstance(packageName);
+                }
             } break;
 
             case Intent.ACTION_MANAGE_PERMISSION_APPS: {
@@ -57,7 +70,13 @@ public final class ManagePermissionsActivity extends OverlayTouchActivity {
                     finish();
                     return;
                 }
-                fragment = PermissionAppsFragment.newInstance(permissionName);
+                if (Utils.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: {