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

Browse Source
This commit is contained in:
Jackal Guo
2021-06-21 00:55:30 +00:00
committed by Android (Google) Code Review
parent 4c4c6d1b2c 30611ae54d
commit 283d6be179
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26467,16 +26467,12 @@ public class PackageManagerService extends IPackageManager.Stub
} }
synchronized(mLock) { synchronized(mLock) {
final AndroidPackage pkg = mPackages.get(packageName); final AndroidPackage pkg = mPackages.get(packageName);
if (pkg == null) { if (pkg == null
|| shouldFilterApplicationLocked(getPackageSetting(pkg.getPackageName()),
Binder.getCallingUid(), UserHandle.getCallingUserId())) {
Slog.w(TAG, "KeySet requested for unknown package: " + packageName); Slog.w(TAG, "KeySet requested for unknown package: " + packageName);
throw new IllegalArgumentException("Unknown package: " + packageName); throw new IllegalArgumentException("Unknown package: " + packageName);
} }
final PackageSetting ps = getPackageSetting(pkg.getPackageName());
if (shouldFilterApplicationLocked(
ps, Binder.getCallingUid(), UserHandle.getCallingUserId())) {
Slog.w(TAG, "KeySet requested for filtered package: " + packageName);
throw new IllegalArgumentException("Unknown package: " + packageName);
}
final KeySetManagerService ksms = mSettings.getKeySetManagerService(); final KeySetManagerService ksms = mSettings.getKeySetManagerService();
return new KeySet(ksms.getKeySetByAliasAndPackageNameLPr(packageName, alias)); return new KeySet(ksms.getKeySetByAliasAndPackageNameLPr(packageName, alias));
} }