diff options
| author | 2017-10-25 15:51:36 -0700 | |
|---|---|---|
| committer | 2017-10-25 15:51:36 -0700 | |
| commit | 1efb833c72be205805a4a70218ccac2785201062 (patch) | |
| tree | 65a94d7524a7f40d8b906af39792e7552a9bc4bf | |
| parent | 642daafd2ba53297d1c0d86a30a60feb48009fda (diff) | |
Fix NPE
Accidentally removed a check for whether or not the disabled
package setting was null
Bug: 68260103
Test: Manual
Change-Id: I6a634f2292948283153659eb4ef64524cbf53a78
| -rw-r--r-- | services/core/java/com/android/server/pm/permission/PermissionManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java index 41b1add4144f..abe4f5ed44ad 100644 --- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java +++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java @@ -1056,7 +1056,7 @@ public class PermissionManagerService { // before. In this case we do want to allow the app to // now get the new permission if the ancestral apk is // privileged to get it. - if (disabledPkg != null + if (disabledPs != null && disabledPkg != null && isPackageRequestingPermission(disabledPkg, perm) && ((privilegedPermission && disabledPs.isPrivileged()) || (oemPermission && disabledPs.isOem() |