Merge "Get userId from stored CallingUid when calling identity is cleared" into udc-dev am: 76ae0024ea am: 5ea0c9b871
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22860556 Change-Id: Iba9b8b63c623e330a8690eef47f66023f3e6f4ee 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)) {
|
||||
return;
|
||||
}
|
||||
final int callingUserId = UserHandle.getCallingUserId();
|
||||
final int callingUserId = UserHandle.getUserId(callingUid);
|
||||
if (callingUserId == userId
|
||||
|| !mAm.mUserController.isSameProfileGroup(callingUserId, userId)) {
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user