| commit | 1efb833c72be205805a4a70218ccac2785201062 | [log] [tgz] |
|---|---|---|
| author | Todd Kennedy <toddke@google.com> | Wed Oct 25 15:51:36 2017 -0700 |
| committer | Todd Kennedy <toddke@google.com> | Wed Oct 25 15:51:36 2017 -0700 |
| tree | 65a94d7524a7f40d8b906af39792e7552a9bc4bf | |
| parent | 642daafd2ba53297d1c0d86a30a60feb48009fda [diff] [blame] |
Fix NPE Accidentally removed a check for whether or not the disabled package setting was null Bug: 68260103 Test: Manual Change-Id: I6a634f2292948283153659eb4ef64524cbf53a78
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 41b1add..abe4f5e 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 @@ // 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()