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

Commit 08628ca4 authored by Hai Zhang's avatar Hai Zhang Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE introduced by ag/16740473." into tm-dev am: c6c97b7b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17072076

Change-Id: I15e52d0f51eda7cd245f6b4c0b57c2662ff4c42a
parents 8c125b93 c6c97b7b

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

+3 −0
Original line number Diff line number Diff line
@@ -2554,6 +2554,9 @@ public class PermissionManagerServiceImpl implements PermissionManagerServiceInt 
            for (int i = 0; i < packagesSize; i++) {

                AndroidPackageApi sharedUserPackage =

                        packages.valueAt(i).getAndroidPackage();

                if (sharedUserPackage == null) {

                    continue;

                }

                uidRequestedPermissions.addAll(

                        sharedUserPackage.getRequestedPermissions());

                uidImplicitPermissions.addAll(