summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Svet Ganov <svetoslavganov@google.com> 2017-07-28 21:35:07 +0000
committer android-build-merger <android-build-merger@google.com> 2017-07-28 21:35:07 +0000
commit750fc6627bd33c54d1bd9dbff87eb316391d6a59 (patch)
tree7c424e1e2eee365b3a5630d2c450a718f073fc47
parenta514e9e4b2345fc5b6c6a16946528c3c5af01fae (diff)
parentc200689d6c19c6cf657a4131539f51244db67553 (diff)
Handle case for missing permissions - fix NPE am: 39cc33f192
am: c200689d6c Change-Id: I1f89e77d2b32b79189dbdbcee8df88c053601c9b
-rw-r--r--services/core/java/com/android/server/pm/PackageManagerService.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 5b24d8b24f3b..3ea9908bb5ad 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -4007,8 +4007,10 @@ public class PackageManagerService extends IPackageManager.Stub
final BasePermission p = mSettings.mPermissions.get(name);
// If the caller is an app that targets pre 26 SDK drop protection flags.
final PermissionInfo permissionInfo = generatePermissionInfo(p, flags);
- permissionInfo.protectionLevel = adjustPermissionProtectionFlagsLPr(
- permissionInfo.protectionLevel, packageName, callingUid);
+ if (permissionInfo != null) {
+ permissionInfo.protectionLevel = adjustPermissionProtectionFlagsLPr(
+ permissionInfo.protectionLevel, packageName, callingUid);
+ }
return permissionInfo;
}
}