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

Merge "Generalize canPackageQuery error message" into tm-dev

Browse Source
This commit is contained in:
Winson Chiu
2022-05-16 16:19:15 +00:00
committed by Android (Google) Code Review
parent cd1a10a216 4e0bd1e973
commit 96ad5ccad9
1 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5443,22 +5443,18 @@ public class ComputerEngine implements Computer {
false /*checkShell*/, "may package query"); false /*checkShell*/, "may package query");
final PackageStateInternal sourceSetting = getPackageStateInternal(sourcePackageName); final PackageStateInternal sourceSetting = getPackageStateInternal(sourcePackageName);
final PackageStateInternal targetSetting = getPackageStateInternal(targetPackageName); final PackageStateInternal targetSetting = getPackageStateInternal(targetPackageName);
if (sourceSetting == null || targetSetting == null) { boolean throwException = sourceSetting == null || targetSetting == null;
throw new ParcelableException(new PackageManager.NameNotFoundException("Package(s) " if (!throwException) {
+ (sourceSetting == null ? sourcePackageName + " " : "") final boolean filterSource =
+ (targetSetting == null ? targetPackageName + " " : "") shouldFilterApplication(sourceSetting, callingUid, userId);
+ "not found.")); final boolean filterTarget =
shouldFilterApplication(targetSetting, callingUid, userId);
// The caller must have visibility of the both packages
throwException = filterSource || filterTarget;
} }
final boolean filterSource = if (throwException) {
shouldFilterApplication(sourceSetting, callingUid, userId);
final boolean filterTarget =
shouldFilterApplication(targetSetting, callingUid, userId);
// The caller must have visibility of the both packages
if (filterSource || filterTarget) {
throw new ParcelableException(new PackageManager.NameNotFoundException("Package(s) " throw new ParcelableException(new PackageManager.NameNotFoundException("Package(s) "
+ (filterSource ? sourcePackageName + " " : "") + sourcePackageName + " and/or " + targetPackageName + " not found."));
+ (filterTarget ? targetPackageName + " " : "")
+ "not found."));
} }
final int sourcePackageUid = UserHandle.getUid(userId, sourceSetting.getAppId()); final int sourcePackageUid = UserHandle.getUid(userId, sourceSetting.getAppId());
return !shouldFilterApplication(targetSetting, sourcePackageUid, userId); return !shouldFilterApplication(targetSetting, sourcePackageUid, userId);