diff options
author | Svet Ganov <svetoslavganov@google.com> | 2016-04-29 09:20:03 -0700 |
---|---|---|
committer | Svet Ganov <svetoslavganov@google.com> | 2016-04-29 09:20:06 -0700 |
commit | 89e2c90c070c07d1ea95b486469cef8f88a87105 (patch) | |
tree | 1ede421210b94d4751419b2d77e4af94e07d26dd /src | |
parent | eff96c98b69ed6340f2e2d4adb99ab85389fcf19 (diff) | |
download | android_packages_apps_PackageInstaller-89e2c90c070c07d1ea95b486469cef8f88a87105.tar.gz android_packages_apps_PackageInstaller-89e2c90c070c07d1ea95b486469cef8f88a87105.tar.bz2 android_packages_apps_PackageInstaller-89e2c90c070c07d1ea95b486469cef8f88a87105.zip |
Fix a NPE in PackageInstaller
We were returing a null PermissionGroup object to a place
where this was not expected by design. The reason for that
was an incorrect fix for b/28241097. This CL reverts the
introduced regression and adds a null check just in case.
bug:27102458
Change-Id: I78f8107d0adf6bb2da5d8e11c5f3cf3c00fe36a2
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/packageinstaller/permission/model/AppPermissionGroup.java | 4 | ||||
-rw-r--r-- | src/com/android/packageinstaller/permission/model/PermissionApps.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java b/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java index ca66449d..a6601165 100644 --- a/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java +++ b/src/com/android/packageinstaller/permission/model/AppPermissionGroup.java @@ -162,10 +162,6 @@ public final class AppPermissionGroup implements Comparable<AppPermissionGroup> group.addPermission(permission); } - if (group.getPermissions().isEmpty()) { - return null; - } - return group; } diff --git a/src/com/android/packageinstaller/permission/model/PermissionApps.java b/src/com/android/packageinstaller/permission/model/PermissionApps.java index b40b5b9f..2025420e 100644 --- a/src/com/android/packageinstaller/permission/model/PermissionApps.java +++ b/src/com/android/packageinstaller/permission/model/PermissionApps.java @@ -190,6 +190,10 @@ public class PermissionApps { AppPermissionGroup group = AppPermissionGroup.create(mContext, app, groupInfo, groupPermInfos, user); + if (group == null) { + continue; + } + String label = mSkipUi ? app.packageName : app.applicationInfo.loadLabel(mPm).toString(); PermissionApp permApp = new PermissionApp(app.packageName, |