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

Commit d3c8a4c3 authored by Bonian Chen's avatar Bonian Chen Committed by Gerrit Code Review
Browse files

Merge "Mainline remove hide api SubscriptionInfo.getCardString"

parents 6afb84d6 888e9cbd

src/com/android/settings/network/SubscriptionUtil.java

+1 −4
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import android.telephony.SubscriptionInfo; 
import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.telephony.UiccSlotInfo;

import android.text.TextUtils;



import androidx.annotation.VisibleForTesting;
@@ -162,9 +161,7 @@ public class SubscriptionUtil { 
            // verify if subscription is inserted within slot

            for (UiccSlotInfo slotInfo : slotsInfo) {

                if ((slotInfo != null) && (!slotInfo.getIsEuicc())

                        && (slotInfo.getCardStateInfo() == CARD_STATE_INFO_PRESENT)

                        && (slotInfo.getLogicalSlotIdx() == subInfo.getSimSlotIndex())

                        && TextUtils.equals(slotInfo.getCardId(), subInfo.getCardString())) {

                        && (slotInfo.getLogicalSlotIdx() == subInfo.getSimSlotIndex())) {

                    return true;

                }

            }

tests/robotests/src/com/android/settings/network/SubscriptionUtilTest.java

+0 −5
Original line number Diff line number Diff line
@@ -94,15 +94,12 @@ public class SubscriptionUtilTest { 


        when(info1.getSubscriptionId()).thenReturn(111);

        when(info1.getSimSlotIndex()).thenReturn(-1);

        when(info1.getCardString()).thenReturn("info1_cardid");



        when(info2.getSubscriptionId()).thenReturn(222);

        when(info2.getSimSlotIndex()).thenReturn(-1);

        when(info2.getCardString()).thenReturn("info2_cardid");



        when(info3.getSubscriptionId()).thenReturn(333);

        when(info3.getSimSlotIndex()).thenReturn(0);

        when(info3.getCardString()).thenReturn("info3_cardid");



        when(mSubMgr.getSelectableSubscriptionInfoList()).thenReturn(Arrays.asList(info1));

        when(mSubMgr.getAllSubscriptionInfoList()).thenReturn(Arrays.asList(info1, info2, info3));
@@ -112,11 +109,9 @@ public class SubscriptionUtilTest { 


        when(info2slot.getLogicalSlotIdx()).thenReturn(-1);

        when(info2slot.getCardStateInfo()).thenReturn(CARD_STATE_INFO_ABSENT);

        when(info2slot.getCardId()).thenReturn("info2_cardid");



        when(info3slot.getLogicalSlotIdx()).thenReturn(0);

        when(info3slot.getCardStateInfo()).thenReturn(CARD_STATE_INFO_PRESENT);

        when(info3slot.getCardId()).thenReturn("info3_cardid");



        final UiccSlotInfo[] slotInfos = {info2slot, info3slot};

        when(mTelMgr.getUiccSlotsInfo()).thenReturn(slotInfos);