commit 90c0d195319314ac692f07c028aeac1595631ae1
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jul 22 20:28:30 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 22 20:28:30 2021 +0000
tree 3e18dfc329e9b99e3e8e7a544a1e7e0911e65009
parent 7af6fdf128430290df6ed3085ff22b3e9560c12c
parent 8230c1a3814bcc2a096f355cfff91a5ee4dad107

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

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);