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

Commit 7e4703cc authored by Hai Zhang's avatar Hai Zhang
Browse files

Fix NPE in AppOpsService when calling getPackagesForUid(). 

Because getPackagesForUid() may return null.

Fixes: 309239679
Test: presubmit
Change-Id: I1233e7fe6d7c96d8a47253578ce2216abf22faa7
parent 5c8bcb31

services/core/java/com/android/server/appop/AppOpsService.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -2391,7 +2391,8 @@ public class AppOpsService extends IAppOpsService.Stub { 
        long token = Binder.clearCallingIdentity();

        long token = Binder.clearCallingIdentity();

        try {

        try {

            // Permissions are managed by UIDs, but unfortunately a package name is required in API.

            // Permissions are managed by UIDs, but unfortunately a package name is required in API.

            String packageName = ArrayUtils.firstOrNull(packageManager.getPackagesForUid(uid));

            String packageName = ArrayUtils.firstOrNull(ArrayUtils.defeatNullable(

                    packageManager.getPackagesForUid(uid)));

            if (packageName == null) {

            if (packageName == null) {

                return false;

                return false;

            }

            }