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

Null check on permission request check

Browse Source 
This change adds a null check on PackageSetting.pkg before passing it on
to the method that checks for the QUERY_ALL_PACKAGES permission on the
package.

Test: atest AppEnumerationTests AppsFilterTest
Bug: 150405193
Change-Id: Ic92e29c685ff215f1c54dbb4aa8a0c6377a30fa7
This commit is contained in:
Patrick Baumann
2020-06-16 14:31:16 -07:00
parent 0192f737ff
commit 257b9e451f
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 {
Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "requestsQueryAllPackages");
if (callingPkgSetting != null) {
if (requestsQueryAllPackages(callingPkgSetting)) {
return false;
}
if (callingPkgSetting.pkg != null
&& requestsQueryAllPackages(callingPkgSetting.pkg)) {
return false;
}
} else {
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;
}
}
@@ -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
// package directly
return pkgSetting.pkg.getRequestedPermissions().contains(
return pkg.getRequestedPermissions().contains(
Manifest.permission.QUERY_ALL_PACKAGES);
}