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

Commit 00e0cdf3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Check cross user permission before clear calling identity in... 

Merge "Check cross user permission before clear calling identity in getSimCallManagerForUser." into sc-dev am: 90c0d195

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/15332151

Change-Id: I16dbeca12d6e69aae8cfeb11c9b478b9a8abea48
parents 2bc3014f 90c0d195

src/com/android/server/telecom/TelecomServiceImpl.java

+3 −3
Original line number Diff line number Diff line
@@ -471,11 +471,11 @@ public class TelecomServiceImpl { 
                try {

                    Log.startSession("TSI.gSCMFU");

                    final int callingUid = Binder.getCallingUid();

                    long token = Binder.clearCallingIdentity();

                    try {

                    if (user != ActivityManager.getCurrentUser()) {

                        enforceCrossUserPermission(callingUid);

                    }

                    long token = Binder.clearCallingIdentity();

                    try {

                        return mPhoneAccountRegistrar.getSimCallManager(UserHandle.of(user));

                    } finally {

                        Binder.restoreCallingIdentity(token);