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

Merge changes Ic92e29c6,I6e044606 into rvc-dev am: eb18301bd5 am: ef2ec0dbb4 am: 8579b272ae

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11886117

Change-Id: I895b5617e481580a3e69983f7a2f7f30f6dd0766
This commit is contained in:
TreeHugger Robot
2020-06-17 06:13:39 +00:00
committed by Automerger Merge Worker
parent 7a2c4b7762 8579b272ae
commit 3d34c594b0
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
services/core/java/com/android/server/pm/AppsFilter.java
View File

@@ -964,12 +964,14 @@ public class AppsFilter {
try { try {
Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "requestsQueryAllPackages"); Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "requestsQueryAllPackages");
if (callingPkgSetting != null) { if (callingPkgSetting != null) {
if (requestsQueryAllPackages(callingPkgSetting)) { if (callingPkgSetting.pkg != null
return false; && requestsQueryAllPackages(callingPkgSetting.pkg)) {
} return false;
}
} else { } else {
for (int i = callingSharedPkgSettings.size() - 1; i >= 0; i--) { for (int i = callingSharedPkgSettings.size() - 1; i >= 0; i--) {
if (requestsQueryAllPackages(callingSharedPkgSettings.valueAt(i))) { AndroidPackage pkg = callingSharedPkgSettings.valueAt(i).pkg;
if (pkg != null && requestsQueryAllPackages(pkg)) {
return false; return false;
} }
} }
@@ -1058,10 +1060,10 @@ public class AppsFilter {
} }
private static boolean requestsQueryAllPackages(PackageSetting pkgSetting) { private static boolean requestsQueryAllPackages(@NonNull AndroidPackage pkg) {
// we're not guaranteed to have permissions yet analyzed at package add, so we inspect the // we're not guaranteed to have permissions yet analyzed at package add, so we inspect the
// package directly // package directly
return pkgSetting.pkg.getRequestedPermissions().contains( return pkg.getRequestedPermissions().contains(
Manifest.permission.QUERY_ALL_PACKAGES); Manifest.permission.QUERY_ALL_PACKAGES);
} }