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

Merge "Don't blindly reference package object"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-10-26 17:46:50 +00:00
committed by Android (Google) Code Review
parent bb18e32964 1ab4384c57
commit 75a3451753
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/core/java/com/android/server/pm/permission/PermissionManagerService.java
View File

@@ -288,7 +288,21 @@ public class PermissionManagerService {
final String[] packages = mContext.getPackageManager().getPackagesForUid(uid);
if (packages != null && packages.length > 0) {
final PackageParser.Package pkg = mPackageManagerInt.getPackage(packages[0]);
Slog.e(TAG, "TODD: Packages: " + Arrays.toString(packages));
PackageParser.Package pkg = null;
for (String packageName : packages) {
pkg = mPackageManagerInt.getPackage(packageName);
if (pkg != null) {
Slog.e(TAG, "TODD: Using packge: " + packageName);
break;
} else {
Slog.e(TAG, "TODD: Missing packge: " + packageName);
}
}
if (pkg == null) {
Slog.e(TAG, "TODD: No package not found; UID: " + uid);
return PackageManager.PERMISSION_DENIED;
}
if (pkg.mSharedUserId != null) {
if (isCallerInstantApp) {
return PackageManager.PERMISSION_DENIED;