Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d78a8bd authored by Nazanin Bakhshi's avatar Nazanin Bakhshi Committed by Android (Google) Code Review
Browse files

Merge "Clear and restore callingIdentity for getSubscriberId to be able to... 

Merge "Clear and restore callingIdentity for getSubscriberId to be able to call isActiveSubId with permission checks" into qt-r1-dev
parents c9171f64 a481261a

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

+9 −2
Original line number Diff line number Diff line
@@ -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 {