diff options
| author | Jason Monk <jmonk@google.com> | 2015-06-18 17:57:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-18 17:57:37 +0000 |
| commit | d713bc269e6341f160581164c7d656f971136fb8 (patch) | |
| tree | e57d1d78124ab0376cefceee0ed00e379f519a73 /src/com/android/packageinstaller/permission/ui | |
| parent | 8eebb878bae3f0ed43d176af8e0c0fd46a83aa3b (diff) | |
| parent | 5cce11574dc8bd5068b9cc85303c5ab1c1bf38ce (diff) | |
| download | android_packages_apps_PackageInstaller-d713bc269e6341f160581164c7d656f971136fb8.tar.gz android_packages_apps_PackageInstaller-d713bc269e6341f160581164c7d656f971136fb8.tar.bz2 android_packages_apps_PackageInstaller-d713bc269e6341f160581164c7d656f971136fb8.zip | |
Merge "Fix crash if show system is selected too soon" into mnc-dev
Diffstat (limited to 'src/com/android/packageinstaller/permission/ui')
| -rw-r--r-- | src/com/android/packageinstaller/permission/ui/PermissionAppsFragment.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/packageinstaller/permission/ui/PermissionAppsFragment.java b/src/com/android/packageinstaller/permission/ui/PermissionAppsFragment.java index 3c05c463..d0e5452c 100644 --- a/src/com/android/packageinstaller/permission/ui/PermissionAppsFragment.java +++ b/src/com/android/packageinstaller/permission/ui/PermissionAppsFragment.java @@ -108,7 +108,9 @@ public final class PermissionAppsFragment extends PreferenceFragment implements 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 @@ public final class PermissionAppsFragment extends PreferenceFragment implements setPreferenceScreen(preferences); } preferences.removeAll(); - for (PermissionApp app : mPermissionApps.getApps()) { + for (PermissionApp app : permissionApps.getApps()) { if (!Utils.shouldShowPermission(app)) { continue; } |