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

Merge "Fixed Attribution Source’s calling Uid check for multiuser." am: ec48cfcfcd

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

Change-Id: I8885ae1fbf8bfdd7b5f67f95ad3cad6c81d11b2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Cintia Martins
2022-11-16 20:53:25 +00:00
committed by Automerger Merge Worker
parent f3af3a21da ec48cfcfcd
commit 8e151a5245
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/content/AttributionSource.java
View File

@@ -29,6 +29,7 @@ import android.os.IBinder;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.os.Process; import android.os.Process;
import android.os.UserHandle;
import android.permission.PermissionManager; import android.permission.PermissionManager;
import android.util.ArraySet; import android.util.ArraySet;
@@ -297,7 +298,7 @@ public final class AttributionSource implements Parcelable {
public boolean checkCallingUid() { public boolean checkCallingUid() {
final int callingUid = Binder.getCallingUid(); final int callingUid = Binder.getCallingUid();
if (callingUid != Process.ROOT_UID if (callingUid != Process.ROOT_UID
&& callingUid != Process.SYSTEM_UID && UserHandle.getAppId(callingUid) != Process.SYSTEM_UID
&& callingUid != mAttributionSourceState.uid) { && callingUid != mAttributionSourceState.uid) {
return false; return false;
} }