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

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

Fix inconsistent getPackageInfo() calls when parsing exceptions. 

This change makes the two checks check against the same PackageInfo to
be more consistent. Previously the former check was checking the one
returned by getPackageInfo() and the latter check was checking the one
returned by getSystemPackageInfo().

Bug: 117246830
Test: manual
Change-Id: I01a677f10634c45e5a9a967b0f5287a66f3e7482
parent 3bc4ab48

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

+4 −3
Original line number Diff line number Diff line
@@ -1293,14 +1293,15 @@ public final class DefaultPermissionGrantPolicy { 
                        outGrantExceptions.get(packageName);

                if (packageExceptions == null) {

                    // The package must be on the system image

                    if (!isSystemPackage(packageName)) {

                        Log.w(TAG, "Unknown package:" + packageName);

                    PackageInfo packageInfo = getSystemPackageInfo(packageName);

                    if (!isSystemPackage(packageInfo)) {

                        Log.w(TAG, "Unknown system package:" + packageName);

                        XmlUtils.skipCurrentTag(parser);

                        continue;

                    }



                    // The package must support runtime permissions

                    if (!doesPackageSupportRuntimePermissions(getSystemPackageInfo(packageName))) {

                    if (!doesPackageSupportRuntimePermissions(packageInfo)) {

                        Log.w(TAG, "Skipping non supporting runtime permissions package:"

                                + packageName);

                        XmlUtils.skipCurrentTag(parser);