diff options
| author | 2017-07-28 21:23:04 +0000 | |
|---|---|---|
| committer | 2017-07-28 21:23:04 +0000 | |
| commit | c200689d6c19c6cf657a4131539f51244db67553 (patch) | |
| tree | 48e914e18191f66af8a6296f73b94129e969c9cd | |
| parent | 557b11bac1a5c0cb78b2853057df88890dbe6233 (diff) | |
| parent | 39cc33f192d528f250818446ea0418aaf0cfe41f (diff) | |
Handle case for missing permissions - fix NPE
am: 39cc33f192
Change-Id: I5fc2ebc009baa242bf9848af62a8f9231afa8045
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerService.java | 6 |
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 41cfc0ac8c62..1be9cc4f5ab9 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -4006,8 +4006,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; } } |