commit a481261aed303faecc27f7b72ae268f431e51b2d
author Nazanin Bakhshi <nazaninb@google.com> Thu Jun 27 17:11:50 2019 -0700
committer Nazanin Bakhshi <nazaninb@google.com> Fri Jun 28 09:59:35 2019 -0700
tree 6164e8e7a31d314cad28d29e471bc6017da7a16b
parent 2ea06507814fc690a4103cb9f3e262639fbfd87e

Clear and restore callingIdentity for getSubscriberId
to be able to call isActiveSubId with permission checks

Bug: 136062407
Test: ran failing cts test module CtsAppSecurityHostTestCases
Change-Id: I1b64b985aac1eccb489d2205da3b3bcaea3d2509

src/java/com/android/internal/telephony/PhoneSubInfoController.java

diff --git a/src/java/com/android/internal/telephony/PhoneSubInfoController.java b/src/java/com/android/internal/telephony/PhoneSubInfoController.java
index d655468..c5b7eda 100644
--- a/src/java/com/android/internal/telephony/PhoneSubInfoController.java
+++ b/src/java/com/android/internal/telephony/PhoneSubInfoController.java
@@ -126,7 +126,14 @@
 
     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 @@
                     mContext, subId, callingPackage, message)) {
                 return null;
             }
-            final long identity = Binder.clearCallingIdentity();
+            identity = Binder.clearCallingIdentity();
             try {
                 return SubscriptionController.getInstance().getImsiPrivileged(subId);
             } finally {