Hide platform platform legacy permissions behind a menu option - package installer.

bug:21195624

Change-Id: If6de516d76969c3627316d091893da58f81af832

1 files changed, 28 insertions, 17 deletions

diff --git a/src/com/android/packageinstaller/permission/ui/ManagePermissionsActivity.java b/src/com/android/packageinstaller/permission/ui/ManagePermissionsActivity.java
index ef117a9c..2fc1a02b 100644
--- a/src/com/android/packageinstaller/permission/ui/ManagePermissionsActivity.java
+++ b/src/com/android/packageinstaller/permission/ui/ManagePermissionsActivity.java
@@ -31,26 +31,37 @@ public final class ManagePermissionsActivity extends Activity {
 
         Fragment fragment = null;
         String action = getIntent().getAction();
-        if (Intent.ACTION_MANAGE_APP_PERMISSIONS.equals(action)) {
-            String packageName = getIntent().getStringExtra(Intent.EXTRA_PACKAGE_NAME);
-            if (packageName == null) {
-                Log.i(LOG_TAG, "Missing mandatory argument EXTRA_PACKAGE_NAME");
-                finish();
-                return;
-            }
-            fragment = AppPermissionsFragment.newInstance(packageName);
-        } else if (Intent.ACTION_MANAGE_PERMISSION_APPS.equals(action)) {
-            String permissionName = getIntent().getStringExtra(Intent.EXTRA_PERMISSION_NAME);
-            if (permissionName == null) {
-                Log.i(LOG_TAG, "Missing mandatory argument EXTRA_PERMISSION_NAME");
+
+        switch (action) {
+            case Intent.ACTION_MANAGE_PERMISSIONS: {
+                fragment = ManagePermissionsFragment.newInstance();
+            } break;
+
+            case Intent.ACTION_MANAGE_APP_PERMISSIONS: {
+                String packageName = getIntent().getStringExtra(Intent.EXTRA_PACKAGE_NAME);
+                if (packageName == null) {
+                    Log.i(LOG_TAG, "Missing mandatory argument EXTRA_PACKAGE_NAME");
+                    finish();
+                    return;
+                }
+                fragment = AppPermissionsFragment.newInstance(packageName);
+            } break;
+
+            case Intent.ACTION_MANAGE_PERMISSION_APPS: {
+                String permissionName = getIntent().getStringExtra(Intent.EXTRA_PERMISSION_NAME);
+                if (permissionName == null) {
+                    Log.i(LOG_TAG, "Missing mandatory argument EXTRA_PERMISSION_NAME");
+                    finish();
+                    return;
+                }
+                fragment = PermissionAppsFragment.newInstance(permissionName);
+            } break;
+
+            default: {
+                Log.w(LOG_TAG, "Unrecognized action " + action);
                 finish();
                 return;
             }
-            fragment = PermissionAppsFragment.newInstance(permissionName);
-        } else {
-            Log.w(LOG_TAG, "Unrecognized action " + action);
-            finish();
-            return;
         }
 
         getFragmentManager().beginTransaction().replace(android.R.id.content, fragment).commit();