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

Merge "Enforce package visibility to the api checkUriPermission" into sc-dev am: 293b6bf6a2

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

Change-Id: I9d5fc9d13fa7bcb8599f181db77624cc2938f722
This commit is contained in:
Rhed Jao
2021-06-24 02:43:39 +00:00
committed by Automerger Merge Worker
parent 6d0835171d 293b6bf6a2
commit 732f56475a
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -5690,6 +5690,16 @@ public class ActivityManagerService extends IActivityManager.Stub
if (pid == MY_PID) {
return PackageManager.PERMISSION_GRANTED;
}
try {
if (uid != 0) { // bypass the root
final String[] packageNames = getPackageManager().getPackagesForUid(uid);
if (ArrayUtils.isEmpty(packageNames)) {
// The uid is not existed or not visible to the caller.
return PackageManager.PERMISSION_DENIED;
}
}
} catch (RemoteException e) {
}
return mUgmInternal.checkUriPermission(new GrantUri(userId, uri, modeFlags), uid, modeFlags)
? PackageManager.PERMISSION_GRANTED : PackageManager.PERMISSION_DENIED;
}