Snap for 5713174 from df0177f979a4f5ca82f302bc00aab03f417432b8 to qt-release

Change-Id: Ia4b336f486941a1e2cc71d23c1c5045ac6b4552c

1 files changed, 9 insertions, 2 deletions

diff --git a/src/java/com/android/internal/telephony/PhoneSubInfoController.java b/src/java/com/android/internal/telephony/PhoneSubInfoController.java
index d655468104..c5b7edafc2 100644
--- a/src/java/com/android/internal/telephony/PhoneSubInfoController.java
+++ b/src/java/com/android/internal/telephony/PhoneSubInfoController.java
@@ -126,7 +126,14 @@ public class PhoneSubInfoController extends IPhoneSubInfo.Stub {
 
     public String getSubscriberIdForSubscriber(int subId, String callingPackage) {
         String message = "getSubscriberId";
-        if (SubscriptionController.getInstance().isActiveSubId(subId, callingPackage)) {
+        long identity = Binder.clearCallingIdentity();
+        boolean isActive;
+        try {
+            isActive = SubscriptionController.getInstance().isActiveSubId(subId, callingPackage);
+        } finally {
+            Binder.restoreCallingIdentity(identity);
+        }
+        if (isActive) {
             return callPhoneMethodForSubIdWithReadSubscriberIdentifiersCheck(subId, callingPackage,
                     message, (phone) -> phone.getSubscriberId());
         } else {
@@ -134,7 +141,7 @@ public class PhoneSubInfoController extends IPhoneSubInfo.Stub {
                     mContext, subId, callingPackage, message)) {
                 return null;
             }
-            final long identity = Binder.clearCallingIdentity();
+            identity = Binder.clearCallingIdentity();
             try {
                 return SubscriptionController.getInstance().getImsiPrivileged(subId);
             } finally {