diff options
| author | Hai Zhang <zhanghai@google.com> | 2019-07-29 13:37:47 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-07-29 13:37:47 -0700 |
| commit | 1c571d6e363055195359984f79f0ae2f4652301a (patch) | |
| tree | f64e4e0b7699cd2da305077d0591b9ed7a792579 | |
| parent | 9cc261940418971a29ff486ebd208f634b3192f9 (diff) | |
| parent | e50e3c0169aba517cc4446bbade225f7e8e612eb (diff) | |
| download | android_packages_apps_PackageInstaller-1c571d6e363055195359984f79f0ae2f4652301a.tar.gz android_packages_apps_PackageInstaller-1c571d6e363055195359984f79f0ae2f4652301a.tar.bz2 android_packages_apps_PackageInstaller-1c571d6e363055195359984f79f0ae2f4652301a.zip | |
Fix permission review crash if there's no permission to review.
am: e50e3c0169
Change-Id: If2edb8dc9f5e781bd70efa99a9631dfbef0c3c57
| -rw-r--r-- | src/com/android/packageinstaller/permission/ui/handheld/ReviewPermissionsFragment.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/packageinstaller/permission/ui/handheld/ReviewPermissionsFragment.java b/src/com/android/packageinstaller/permission/ui/handheld/ReviewPermissionsFragment.java index 85ec2d32..7c2eca40 100644 --- a/src/com/android/packageinstaller/permission/ui/handheld/ReviewPermissionsFragment.java +++ b/src/com/android/packageinstaller/permission/ui/handheld/ReviewPermissionsFragment.java @@ -188,7 +188,10 @@ public final class ReviewPermissionsFragment extends PreferenceFragmentCompat preferenceGroups.add(mNewPermissionsCategory); preferenceGroups.add(mCurrentPermissionsCategory); } else { - preferenceGroups.add(getPreferenceScreen()); + PreferenceScreen preferenceScreen = getPreferenceScreen(); + if (preferenceScreen != null) { + preferenceGroups.add(preferenceScreen); + } } final int preferenceGroupCount = preferenceGroups.size(); |