Merge "DO NOT MERGE Fix PermissionManagerService throwing exception for unknown package." into qt-r1-dev

This commit is contained in:
TreeHugger Robot
2019-08-03 04:57:27 +00:00
committed by Android (Google) Code Review

View File

@@ -2098,7 +2098,8 @@ public class PermissionManagerService {
final PackageParser.Package pkg = mPackageManagerInt.getPackage(packageName);
if (pkg == null || pkg.mExtras == null) {
throw new IllegalArgumentException("Unknown package: " + packageName);
Log.e(TAG, "Unknown package: " + packageName);
return;
}
final BasePermission bp;
synchronized(mLock) {
@@ -2239,7 +2240,8 @@ public class PermissionManagerService {
final PackageParser.Package pkg = mPackageManagerInt.getPackage(packageName);
if (pkg == null || pkg.mExtras == null) {
throw new IllegalArgumentException("Unknown package: " + packageName);
Log.e(TAG, "Unknown package: " + packageName);
return;
}
if (mPackageManagerInt.filterAppAccess(pkg, Binder.getCallingUid(), userId)) {
throw new IllegalArgumentException("Unknown package: " + packageName);