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

Commit c95cc3ae authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by android-build-merger
Browse files

Merge "Add missing null check" into pi-dev 

am: 8eef782e

Change-Id: I65f07944eebe45d867f1b8250cd034dcfffd2816
parents 635c42be 8eef782e

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -1505,6 +1505,9 @@ public class PermissionManagerService { 
            return EmptyArray.INT;

            return EmptyArray.INT;

        }

        }

        for (PackageParser.Package pkg : pkgList) {

        for (PackageParser.Package pkg : pkgList) {

            if (pkg.requestedPermissions == null) {

                continue;

            }

            final int requestedPermCount = pkg.requestedPermissions.size();

            final int requestedPermCount = pkg.requestedPermissions.size();

            for (int j = 0; j < requestedPermCount; j++) {

            for (int j = 0; j < requestedPermCount; j++) {

                String permission = pkg.requestedPermissions.get(j);

                String permission = pkg.requestedPermissions.get(j);