Merge "Get userId from stored CallingUid when calling identity is cleared" into udc-dev am: 76ae0024ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22860556 Change-Id: I30c522886523962ff2272264bd5f0f4fc3224273 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -3866,7 +3866,7 @@ public final class ActiveServices {
|
|||||||
if (UserHandle.isCore(callingUid)) {
|
if (UserHandle.isCore(callingUid)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
final int callingUserId = UserHandle.getCallingUserId();
|
final int callingUserId = UserHandle.getUserId(callingUid);
|
||||||
if (callingUserId == userId
|
if (callingUserId == userId
|
||||||
|| !mAm.mUserController.isSameProfileGroup(callingUserId, userId)) {
|
|| !mAm.mUserController.isSameProfileGroup(callingUserId, userId)) {
|
||||||
return;
|
return;
|
||||||
|
|||||||
Reference in New Issue
Block a user