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

Commit 70b88528 authored by Muralidhar Reddy Mule's avatar Muralidhar Reddy Mule Committed by Automerger Merge Worker
Browse files

Merge "Revert "isSimPortAvailable API should return true if the calling...""... 

Merge "Revert "isSimPortAvailable API should return true if the calling..."" into tm-qpr-dev am: 1559a67c am: 90bede24

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/20755969



Change-Id: I0ac91d932c052c43ebcdbdcde674037e9e4da542
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4d48b39b 90bede24

src/java/com/android/internal/telephony/euicc/EuiccController.java

+45 −57
Original line number Diff line number Diff line
@@ -1948,10 +1948,13 @@ public class EuiccController extends IEuiccController.Stub { 


    @Override

    public boolean isSimPortAvailable(int cardId, int portIndex, String callingPackage) {

        mAppOpsManager.checkPackage(Binder.getCallingUid(), callingPackage);

        List<UiccCardInfo> cardInfos;

        final long token = Binder.clearCallingIdentity();

        try {

            List<UiccCardInfo> cardInfos = mTelephonyManager.getUiccCardsInfo();

            cardInfos = mTelephonyManager.getUiccCardsInfo();

        } finally {

            Binder.restoreCallingIdentity(token);

        }

        for (UiccCardInfo info : cardInfos) {

            if (info == null || info.getCardId() != cardId) {

                continue;
@@ -1966,21 +1969,9 @@ public class EuiccController extends IEuiccController.Stub { 
                if (portInfo == null || portInfo.getPortIndex() != portIndex) {

                    continue;

                }

                // Return false if port is not active.

                if (!portInfo.isActive()) {

                        // port is inactive, check whether the caller can activate a new profile

                        // seamlessly. This is possible in below condition:

                        // 1. Device in DSDS Mode(P+E).

                        // 2. pSIM slot is active but no active subscription.

                        // 3. Caller has carrier privileges on any phone

                        boolean hasActiveRemovableNonEuiccSlot = getRemovableNonEuiccSlot() != null

                                && getRemovableNonEuiccSlot().isActive();

                        boolean hasCarrierPrivileges = mTelephonyManager

                                .checkCarrierPrivilegesForPackageAnyPhone(callingPackage)

                                == TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS;

                        return mTelephonyManager.isMultiSimEnabled()

                                && hasActiveRemovableNonEuiccSlot

                                && !isRemovalNonEuiccSlotHasActiveSubscription()

                                && hasCarrierPrivileges;

                    return false;

                }

                // A port is available if it has no profiles enabled on it or calling app has

                // Carrier privilege over the profile installed on the selected port.
@@ -2011,9 +2002,6 @@ public class EuiccController extends IEuiccController.Stub { 
                        == TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS);

            }

        }

        } finally {

            Binder.restoreCallingIdentity(token);

        }

        return false;

    }