diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-07-28 21:23:04 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-07-28 21:23:04 +0000 |
| commit | 757a03843c7ef83296e525377cd6943330a96c25 (patch) | |
| tree | 1192a3fb7c48907d4dc33db33bc74a976b1a6954 | |
| parent | 7fb2578e9dc43d7b7c052f0be838025edcfa5ec2 (diff) | |
| parent | c9935cbce48c19b403eb479590dd9a1a2e01aaab (diff) | |
| download | base-757a03843c7ef83296e525377cd6943330a96c25.tar.gz | |
Merge cherrypicks of [2624661, 2624224] into oc-release
Change-Id: I37c6e10bca102f2cea44717868c3aac4267ad02e
| -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 c1b98f59566d..ddb583290038 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; } } |