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

Merge "Check only if the app is installed on the other user for blob access." into sc-dev

Browse Source
This commit is contained in:
Sudheer Shanka
2021-06-03 22:31:50 +00:00
committed by Android (Google) Code Review
parent 08ad40f2d9 b395a4d498
commit 2c6a28a5ea
1 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
apex/blobstore/service/java/com/android/server/blob/BlobMetadata.java
View File

@@ -50,6 +50,7 @@ import android.content.Context;
import android.content.pm.PackageManager;
import android.content.res.ResourceId;
import android.content.res.Resources;
import android.os.Binder;
import android.os.ParcelFileDescriptor;
import android.os.RevocableFileDescriptor;
import android.os.UserHandle;
@@ -308,7 +309,7 @@ class BlobMetadata {
if (callingUserId == committerUserId) {
continue;
}
if (!checkCallerCanAccessBlobsAcrossUsers(callingPackage, committerUserId)) {
if (!isPackageInstalledOnUser(callingPackage, committerUserId)) {
continue;
}
@@ -326,8 +327,25 @@ class BlobMetadata {
private static boolean checkCallerCanAccessBlobsAcrossUsers(
String callingPackage, int callingUserId) {
return PermissionManager.checkPackageNamePermission(ACCESS_BLOBS_ACROSS_USERS,
callingPackage, callingUserId) == PackageManager.PERMISSION_GRANTED;
final long token = Binder.clearCallingIdentity();
try {
return PermissionManager.checkPackageNamePermission(ACCESS_BLOBS_ACROSS_USERS,
callingPackage, callingUserId) == PackageManager.PERMISSION_GRANTED;
} finally {
Binder.restoreCallingIdentity(token);
}
}
private boolean isPackageInstalledOnUser(String packageName, int userId) {
final long token = Binder.clearCallingIdentity();
try {
mContext.getPackageManager().getPackageInfoAsUser(packageName, 0, userId);
return true;
} catch (PackageManager.NameNotFoundException e) {
return false;
} finally {
Binder.restoreCallingIdentity(token);
}
}
boolean hasACommitterOrLeaseeInUser(int userId) {