Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS when doing default permission grants" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-11 20:30:42 +00:00
committed by Android (Google) Code Review
parent 25076a030e a8d1a45a1b
commit 44058c6efa
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/pm/permission/DefaultPermissionGrantPolicy.java
View File

@@ -108,7 +108,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";
@@ -1353,8 +1356,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) {