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

Commit 230de7db authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by Android (Google) Code Review
Browse files

Merge "Check if bp.perm is null before resolving it"

parents e222fd90 798bf9a3

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

+2 −1
Original line number Diff line number Diff line
@@ -2122,7 +2122,8 @@ public class PermissionManagerService { 
                // Only system declares background permissions, hence mapping does never change.

                mBackgroundPermissions = new ArrayMap<>();

                for (BasePermission bp : mSettings.getAllPermissionsLocked()) {

                    if (bp.perm.info != null && bp.perm.info.backgroundPermission != null) {

                    if (bp.perm != null && bp.perm.info != null

                            && bp.perm.info.backgroundPermission != null) {

                        String fgPerm = bp.name;

                        String bgPerm = bp.perm.info.backgroundPermission;