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

Commit 6df99bd3 authored by Nazanin Bakhshi's avatar Nazanin Bakhshi Committed by android-build-merger
Browse files

Clear and restore callingIdentity for getSubscriberId to be able to call... 

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

Change-Id: I74f68a901cfa50b1646bae921412b945bffbc063
parents 0f2831ff df0177f9

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

+9 −2
Original line number Original line Diff line number Diff line
@@ -126,7 +126,14 @@ public class PhoneSubInfoController extends IPhoneSubInfo.Stub { 




    public String getSubscriberIdForSubscriber(int subId, String callingPackage) {

    public String getSubscriberIdForSubscriber(int subId, String callingPackage) {

        String message = "getSubscriberId";

        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,

            return callPhoneMethodForSubIdWithReadSubscriberIdentifiersCheck(subId, callingPackage,

                    message, (phone) -> phone.getSubscriberId());

                    message, (phone) -> phone.getSubscriberId());

        } else {

        } else {
@@ -134,7 +141,7 @@ public class PhoneSubInfoController extends IPhoneSubInfo.Stub { 
                    mContext, subId, callingPackage, message)) {

                    mContext, subId, callingPackage, message)) {

                return null;

                return null;

            }

            }

            final long identity = Binder.clearCallingIdentity();

            identity = Binder.clearCallingIdentity();

            try {

            try {

                return SubscriptionController.getInstance().getImsiPrivileged(subId);

                return SubscriptionController.getInstance().getImsiPrivileged(subId);

            } finally {

            } finally {