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

Merge changes from topics "pm_cross_user_pkg_visibility_can_pkg_query", "pm_cross_user_pkg_visibility_has_signing_cert"

Browse Source 
* changes:
  Fix cross user package visibility leakage for canPackageQuery API
  Fix cross user package visibility leakage for hasSigningCertificate
This commit is contained in:
Rhed Jao
2022-06-20 10:05:31 +00:00
committed by Android (Google) Code Review
parent 4bc98cb6e4 44edc93760
commit e4f605e8cf
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4475,13 +4475,11 @@ public class ComputerEngine implements Computer {
if (p == null) {
return false;
}
final PackageStateInternal ps = getPackageStateInternal(p.getPackageName());
if (ps == null) {
return false;
}
final int callingUid = Binder.getCallingUid();
final int callingUserId = UserHandle.getUserId(callingUid);
if (shouldFilterApplication(ps, callingUid, callingUserId)) {
final PackageStateInternal ps = getPackageStateInternal(p.getPackageName());
if (ps == null
|| shouldFilterApplicationIncludingUninstalled(ps, callingUid, callingUserId)) {
return false;
}
switch (type) {
@@ -5571,7 +5569,7 @@ public class ComputerEngine implements Computer {
final PackageStateInternal packageState =
getPackageStateInternal(component.getPackageName());
return packageState != null && !shouldFilterApplication(packageState, callingUid,
component, TYPE_UNKNOWN, userId);
component, TYPE_UNKNOWN, userId, true /* filterUninstall */);
}
@Override
@@ -5615,9 +5613,9 @@ public class ComputerEngine implements Computer {
boolean throwException = sourceSetting == null || targetSetting == null;
if (!throwException) {
final boolean filterSource =
shouldFilterApplication(sourceSetting, callingUid, userId);
shouldFilterApplicationIncludingUninstalled(sourceSetting, callingUid, userId);
final boolean filterTarget =
shouldFilterApplication(targetSetting, callingUid, userId);
shouldFilterApplicationIncludingUninstalled(targetSetting, callingUid, userId);
// The caller must have visibility of the both packages
throwException = filterSource || filterTarget;
}