Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e151a52 authored by Cintia Martins's avatar Cintia Martins Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I8885ae1fbf8bfdd7b5f67f95ad3cad6c81d11b2d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f3af3a21 ec48cfcf

core/java/android/content/AttributionSource.java

+2 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.os.IBinder; 
import android.os.Parcel;

import android.os.Parcelable;

import android.os.Process;

import android.os.UserHandle;

import android.permission.PermissionManager;

import android.util.ArraySet;
@@ -297,7 +298,7 @@ public final class AttributionSource implements Parcelable { 
    public boolean checkCallingUid() {

        final int callingUid = Binder.getCallingUid();

        if (callingUid != Process.ROOT_UID

                && callingUid != Process.SYSTEM_UID

                && UserHandle.getAppId(callingUid) != Process.SYSTEM_UID

                && callingUid != mAttributionSourceState.uid) {

            return false;

        }