diff options
| author | Hai Zhang <zhanghai@google.com> | 2019-07-26 12:04:55 -0700 |
|---|---|---|
| committer | Hai Zhang <zhanghai@google.com> | 2019-07-26 20:53:11 +0000 |
| commit | e50e3c0169aba517cc4446bbade225f7e8e612eb (patch) | |
| tree | 737786dc6e163621ae3d9228bfde4efcb5cdd949 | |
| parent | 77db2a916a98488e7109e985d548aacc507269f5 (diff) | |
| download | android_packages_apps_PackageInstaller-e50e3c0169aba517cc4446bbade225f7e8e612eb.tar.gz android_packages_apps_PackageInstaller-e50e3c0169aba517cc4446bbade225f7e8e612eb.tar.bz2 android_packages_apps_PackageInstaller-e50e3c0169aba517cc4446bbade225f7e8e612eb.zip | |
Fix permission review crash if there's no permission to review.
Fixes: 138386074
Test: presubmit & manual
Change-Id: I4d431206742de017c4000d465fedb3033a98d457
| -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(); |