diff options
| author | Svet Ganov <svetoslavganov@google.com> | 2017-07-28 15:35:06 -0700 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-08-08 18:39:10 +0000 |
| commit | ad45462218375c131e7fe7b67f3763c7287494a8 (patch) | |
| tree | adb31c1db205db9233f38141b3847ea09236cd7e | |
| parent | 83d81dc83c32f22acc80cd3b9038eb9e18b1e14d (diff) | |
| download | base-ad45462218375c131e7fe7b67f3763c7287494a8.tar.gz | |
Add a missing null check
Test: manual
bug::62755026
Change-Id: Icf719d0e62986febd4d31f22be3e59d83c8e6e09
(cherry picked from commit 0ae9570c9925603a04d5a78775a68cc9d437542b)
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerService.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index ddb583290038..f36b762c5e93 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -4004,6 +4004,9 @@ public class PackageManagerService extends IPackageManager.Stub // reader synchronized (mPackages) { final BasePermission p = mSettings.mPermissions.get(name); + if (p == null) { + return null; + } // If the caller is an app that targets pre 26 SDK drop protection flags. final PermissionInfo permissionInfo = generatePermissionInfo(p, flags); if (permissionInfo != null) { |