From b157ef80c877359dd365bc32d3fb7861cfa58e9e Mon Sep 17 00:00:00 2001 From: Hai Zhang Date: Thu, 4 Oct 2018 14:53:04 -0700 Subject: 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 --- .../android/server/pm/permission/DefaultPermissionGrantPolicy.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java index 6f644dd70339..014a006d3504 100644 --- a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java +++ b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java @@ -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); -- cgit v1.2.3-59-g8ed1b