Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2ff53ab authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE"

parents 4ad6c372 1efb833c

services/core/java/com/android/server/pm/permission/PermissionManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -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()