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

Commit c9a82cd3 authored by Hai Zhang's avatar Hai Zhang
Browse files

Fix NPE introduced by ag/16740473. 

A PackageState doesn't always have an AndroidPackage, so we need to do a
null check.

Fixes: 222474286
Test: presubmit
Change-Id: I1603f3cb096a72f65360db2ab7d8ff5823c28e0d
parent 3e2a850f

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(