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 (file)
--- 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()