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

Merge "Revise the IllegalArgumentException check" into sc-dev am: 47330ed2f1

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

Change-Id: I8adc2acdbf84cf1092c0806de5fe3256f45b95c6
This commit is contained in:
Jackal Guo
2021-06-21 01:05:29 +00:00
committed by Automerger Merge Worker
parent fa639f8022 47330ed2f1
commit a6211501cf
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -26487,14 +26487,10 @@ public class PackageManagerService extends IPackageManager.Stub
final int callingUid = Binder.getCallingUid(); final int callingUid = Binder.getCallingUid();
final int callingUserId = UserHandle.getUserId(callingUid); final int callingUserId = UserHandle.getUserId(callingUid);
final AndroidPackage pkg = mPackages.get(packageName); final AndroidPackage pkg = mPackages.get(packageName);
if (pkg == null) { if (pkg == null
Slog.w(TAG, "KeySet requested for unknown package: " + packageName); || shouldFilterApplicationLocked(getPackageSetting(pkg.getPackageName()),
throw new IllegalArgumentException("Unknown package: " + packageName); callingUid, callingUserId)) {
} Slog.w(TAG, "KeySet requested for unknown package: " + packageName
final PackageSetting ps = getPackageSetting(pkg.getPackageName());
if (shouldFilterApplicationLocked(ps, callingUid, callingUserId)) {
// filter and pretend the package doesn't exist
Slog.w(TAG, "KeySet requested for filtered package: " + packageName
+ ", uid:" + callingUid); + ", uid:" + callingUid);
throw new IllegalArgumentException("Unknown package: " + packageName); throw new IllegalArgumentException("Unknown package: " + packageName);
} }