diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-07-30 03:08:59 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-07-30 03:08:59 +0000 |
| commit | 639382a3a2f73ff953cf2b28d058674c7a085aa3 (patch) | |
| tree | fc897cf3d57482fe2a9a27697d7b6298fbac81da | |
| parent | 3cbd35d49e59906a124fd3dddf35c9267e4ac702 (diff) | |
| parent | 976d785a3235315f11b689cd1acf7a99f97a73a3 (diff) | |
| download | android_packages_apps_PackageInstaller-639382a3a2f73ff953cf2b28d058674c7a085aa3.tar.gz android_packages_apps_PackageInstaller-639382a3a2f73ff953cf2b28d058674c7a085aa3.tar.bz2 android_packages_apps_PackageInstaller-639382a3a2f73ff953cf2b28d058674c7a085aa3.zip | |
Snap for 5764218 from 976d785a3235315f11b689cd1acf7a99f97a73a3 to qt-qpr1-release
Change-Id: I7c36dbb1623c39a96f3bd84e279197c49bb84070
| -rw-r--r-- | src/com/android/packageinstaller/permission/ui/handheld/ReviewPermissionsFragment.java | 6 |
1 files changed, 5 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..6c3e224c 100644 --- a/src/com/android/packageinstaller/permission/ui/handheld/ReviewPermissionsFragment.java +++ b/src/com/android/packageinstaller/permission/ui/handheld/ReviewPermissionsFragment.java @@ -121,6 +121,7 @@ public final class ReviewPermissionsFragment extends PreferenceFragmentCompat // If the system called for a review but no groups are found, this means that all groups // are restricted. Hence there is nothing to review and instantly continue. confirmPermissionsReview(); + executeCallback(true); activity.finish(); } } @@ -188,7 +189,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(); |