commit 24db2b0375bd901466777e88eaec1366a49705db
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jul 22 20:32:17 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 22 20:32:17 2021 +0000
tree f096da350fad0caf188145e75b759cee8305417b
parent a96a2c4e1905df73d69547283be92baba81197e8
parent 90c0d195319314ac692f07c028aeac1595631ae1

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

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

Change-Id: I326b18a818e210a68c0ac67684ad8b50ef62fe5c

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

diff --git a/src/com/android/server/telecom/TelecomServiceImpl.java b/src/com/android/server/telecom/TelecomServiceImpl.java
index 712b9ba..65664ba 100644
--- a/src/com/android/server/telecom/TelecomServiceImpl.java
+++ b/src/com/android/server/telecom/TelecomServiceImpl.java
@@ -471,11 +471,11 @@
                 try {
                     Log.startSession("TSI.gSCMFU");
                     final int callingUid = Binder.getCallingUid();
+                    if (user != ActivityManager.getCurrentUser()) {
+                        enforceCrossUserPermission(callingUid);
+                    }
                     long token = Binder.clearCallingIdentity();
                     try {
-                        if (user != ActivityManager.getCurrentUser()) {
-                            enforceCrossUserPermission(callingUid);
-                        }
                         return mPhoneAccountRegistrar.getSimCallManager(UserHandle.of(user));
                     } finally {
                         Binder.restoreCallingIdentity(token);