commit 044cf0fcc5c9f2e242a0848f19f43d2a8d8aaf25
author Jason Monk <jmonk@google.com> Thu Jun 18 13:46:31 2015 -0400
committer Jason Monk <jmonk@google.com> Thu Jun 18 13:46:31 2015 -0400
tree c5b7de067e5995a067d1bc7c509be7b4737ccb9c
parent 8aafcebb884a182cc2910e6ddf0dadc925d22068

Fix crash if show system is selected too soon

Bug: 21871042
Change-Id: I09bf33af37b00009aa935157a66b733826644116

PermissionController/src/com/android/packageinstaller/permission/ui/PermissionAppsFragment.java

diff --git a/PermissionController/src/com/android/packageinstaller/permission/ui/PermissionAppsFragment.java b/PermissionController/src/com/android/packageinstaller/permission/ui/PermissionAppsFragment.java
index 3c05c46..d0e5452 100644
--- a/PermissionController/src/com/android/packageinstaller/permission/ui/PermissionAppsFragment.java
+++ b/PermissionController/src/com/android/packageinstaller/permission/ui/PermissionAppsFragment.java
@@ -108,7 +108,9 @@
             case MENU_SHOW_SYSTEM:
             case MENU_HIDE_SYSTEM:
                 mShowSystem = item.getItemId() == MENU_SHOW_SYSTEM;
-                onPermissionsLoaded(mPermissionApps);
+                if (mPermissionApps.getApps() != null) {
+                    onPermissionsLoaded(mPermissionApps);
+                }
                 updateMenu();
                 break;
         }
@@ -181,7 +183,7 @@
             setPreferenceScreen(preferences);
         }
         preferences.removeAll();
-        for (PermissionApp app : mPermissionApps.getApps()) {
+        for (PermissionApp app : permissionApps.getApps()) {
             if (!Utils.shouldShowPermission(app)) {
                 continue;
             }