commit 91041aa1f8d0cd68b67481386d9e61e0914f5199
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jul 22 20:33:41 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 22 20:33:41 2021 +0000
tree 3e18dfc329e9b99e3e8e7a544a1e7e0911e65009
parent 2fb9a8f6773dc939f4eb4d08128f9bf69c946a33
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: Ie1d26af1b1c7a87d37f6b57d74f47487cfb6e264

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 0037aaf..c873bc4 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);