summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Svet Ganov <svetoslavganov@google.com> 2017-07-28 21:22:57 +0000
committer android-build-merger <android-build-merger@google.com> 2017-07-28 21:22:57 +0000
commit6e527d0ec5ea361419b51a6a8de3a709571605d7 (patch)
treeb60ba0b4eac39f94748fc9dfb0ce4e4213eedccb
parent51f65bbcbff5f2d42df632114b6e8e9e3af10cb3 (diff)
parent39cc33f192d528f250818446ea0418aaf0cfe41f (diff)
Handle case for missing permissions - fix NPE
am: 39cc33f192 Change-Id: I8fd46e293a25ddf83346950e8e700ec9d61e2263
-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;
}
}