From 1efb833c72be205805a4a70218ccac2785201062 Mon Sep 17 00:00:00 2001 From: Todd Kennedy Date: Wed, 25 Oct 2017 15:51:36 -0700 Subject: [PATCH] Fix NPE Accidentally removed a check for whether or not the disabled package setting was null Bug: 68260103 Test: Manual Change-Id: I6a634f2292948283153659eb4ef64524cbf53a78 --- .../android/server/pm/permission/PermissionManagerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 41b1add4144fb..abe4f5ed44ad2 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()