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

Merge "Allow system process register AttributionSource for app from other user" into tm-dev am: 6be9288ddb

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

Change-Id: I927d416c6a35afecbc4e81230f36abc710f42bca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Nate(Qiang) Jiang
2022-06-02 16:40:18 +00:00
committed by Automerger Merge Worker
parent ecaa9ba814 6be9288ddb
commit d7f5f3233d
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -966,8 +966,14 @@ public class PermissionManagerService extends IPermissionManager.Stub {
final PackageManagerInternal packageManagerInternal = LocalServices.getService( final PackageManagerInternal packageManagerInternal = LocalServices.getService(
PackageManagerInternal.class); PackageManagerInternal.class);
if (packageManagerInternal.getPackageUid(source.getPackageName(), 0,
UserHandle.getUserId(callingUid)) != source.getUid()) { // TODO(b/234653108): Clean up this UID/package & cross-user check.
// If calling from the system process, allow registering attribution for package from
// any user
int userId = UserHandle.getUserId((callingUid == Process.SYSTEM_UID ? source.getUid()
: callingUid));
if (packageManagerInternal.getPackageUid(source.getPackageName(), 0, userId)
!= source.getUid()) {
throw new SecurityException("Cannot register attribution source for package:" throw new SecurityException("Cannot register attribution source for package:"
+ source.getPackageName() + " from uid:" + callingUid); + source.getPackageName() + " from uid:" + callingUid);
} }