From a8d1a45a1b588d49af4ad78ebad2d87f62b0ceaa Mon Sep 17 00:00:00 2001 From: Eugene Susla Date: Wed, 10 Apr 2019 18:00:35 -0700 Subject: [PATCH] MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS when doing default permission grants Fixes: 126604115 Test: adb logcat -v tag | grep 'E/DefaultPermGrantPolicy: PackageNot found: com.verizon.mips.services' Change-Id: I7210fc1dcaf17fc9f49349fb06b00621d931cd10 --- .../pm/permission/DefaultPermissionGrantPolicy.java | 8 +++++--- 1 file changed, 5 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 5c386b47b1b14..1639ea85f99d5 100644 --- a/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java +++ b/services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java @@ -106,7 +106,10 @@ public final class DefaultPermissionGrantPolicy { @PackageManager.PackageInfoFlags private static final int DEFAULT_PACKAGE_INFO_QUERY_FLAGS = - PackageManager.MATCH_UNINSTALLED_PACKAGES | PackageManager.GET_PERMISSIONS; + PackageManager.MATCH_UNINSTALLED_PACKAGES + | PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS + | PackageManager.MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS + | PackageManager.GET_PERMISSIONS; private static final String AUDIO_MIME_TYPE = "audio/mpeg"; @@ -1281,8 +1284,7 @@ public final class DefaultPermissionGrantPolicy { } private PackageInfo getSystemPackageInfo(String pkg) { - //TODO not MATCH_SYSTEM_ONLY? - return getPackageInfo(pkg, PackageManager.MATCH_FACTORY_ONLY); + return getPackageInfo(pkg, PackageManager.MATCH_SYSTEM_ONLY); } private PackageInfo getPackageInfo(String pkg) {