Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add a missing null check" into oc-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2017-07-29 15:56:14 +00:00
committed by Android (Google) Code Review
parent f173b2a4c3 0ae9570c99
commit 101fca656d
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -4004,6 +4004,9 @@ public class PackageManagerService extends IPackageManager.Stub
// reader // reader
synchronized (mPackages) { synchronized (mPackages) {
final BasePermission p = mSettings.mPermissions.get(name); 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. // If the caller is an app that targets pre 26 SDK drop protection flags.
final PermissionInfo permissionInfo = generatePermissionInfo(p, flags); final PermissionInfo permissionInfo = generatePermissionInfo(p, flags);
if (permissionInfo != null) { if (permissionInfo != null) {