commit e50e3c0169aba517cc4446bbade225f7e8e612eb
author Hai Zhang <zhanghai@google.com> Fri Jul 26 12:04:55 2019 -0700
committer Hai Zhang <zhanghai@google.com> Fri Jul 26 20:53:11 2019 +0000
tree 737786dc6e163621ae3d9228bfde4efcb5cdd949
parent 77db2a916a98488e7109e985d548aacc507269f5

Fix permission review crash if there's no permission to review.

Fixes: 138386074
Test: presubmit & manual
Change-Id: I4d431206742de017c4000d465fedb3033a98d457

src/com/android/packageinstaller/permission/ui/handheld/ReviewPermissionsFragment.java

diff --git a/src/com/android/packageinstaller/permission/ui/handheld/ReviewPermissionsFragment.java b/src/com/android/packageinstaller/permission/ui/handheld/ReviewPermissionsFragment.java
index 85ec2d3..7c2eca4 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 @@
             preferenceGroups.add(mNewPermissionsCategory);
             preferenceGroups.add(mCurrentPermissionsCategory);
         } else {
-            preferenceGroups.add(getPreferenceScreen());
+            PreferenceScreen preferenceScreen = getPreferenceScreen();
+            if (preferenceScreen != null) {
+                preferenceGroups.add(preferenceScreen);
+            }
         }
 
         final int preferenceGroupCount = preferenceGroups.size();