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

Commit 1a1b6e8c authored by Xiangyu/Malcolm Chen's avatar Xiangyu/Malcolm Chen Committed by Automerger Merge Worker
Browse files

Merge changes Ifb9e5594,I2ed64610,I1e60405e am: 157aa77b 

Change-Id: I54567d0302f797a03ef40d7890c9bd06f90634c1
parents c67fe4b8 157aa77b

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

+3 −2
Original line number Diff line number Diff line
@@ -1431,9 +1431,10 @@ public class SubscriptionController extends ISub.Stub { 
        value.put(SubscriptionManager.CARRIER_NAME, "");

        value.put(SubscriptionManager.CARD_ID, uniqueId);

        value.put(SubscriptionManager.SUBSCRIPTION_TYPE, subscriptionType);

        if (isSubscriptionForRemoteSim(subscriptionType)) {

        if (!TextUtils.isEmpty(displayName)) {

            value.put(SubscriptionManager.DISPLAY_NAME, displayName);

        } else {

        }

        if (!isSubscriptionForRemoteSim(subscriptionType)) {

            UiccCard card = mUiccController.getUiccCardForPhone(slotIndex);

            if (card != null) {

                String cardId = card.getCardId();

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

+59 −15
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ public class SubscriptionInfoUpdater extends Handler { 
    private static final int EVENT_SIM_IMSI = 11;

    private static final int EVENT_REFRESH_EMBEDDED_SUBSCRIPTIONS = 12;

    private static final int EVENT_MULTI_SIM_CONFIG_CHANGED = 13;

    private static final int EVENT_INACTIVE_SLOT_ICC_STATE_CHANGED = 14;



    private static final String ICCID_STRING_FOR_NO_SIM = "";
@@ -198,16 +199,26 @@ public class SubscriptionInfoUpdater extends Handler { 
    /**

     * Update subscriptions when given a new ICC state.

     */

    public void updateInternalIccState(String simStatus, String reason, int phoneId,

            boolean absentAndInactive) {

    public void updateInternalIccState(String simStatus, String reason, int phoneId) {

        logd("updateInternalIccState to simStatus " + simStatus + " reason " + reason

                + " phoneId " + phoneId);

        int message = internalIccStateToMessage(simStatus);

        if (message != EVENT_INVALID) {

            sendMessage(obtainMessage(message, phoneId, absentAndInactive ? 1 : 0, reason));

            sendMessage(obtainMessage(message, phoneId, 0, reason));

        }

    }



    /**

     * Update subscriptions if needed when there's a change in inactive slot.

     * @param prevActivePhoneId is the corresponding phoneId of the slot if slot was previously

     *                          active. It could be INVALID if it was already inactive.

     * @param iccId iccId in that slot, if any.

     */

    public void updateInternalIccStateForInactiveSlot(int prevActivePhoneId, String iccId) {

        sendMessage(obtainMessage(EVENT_INACTIVE_SLOT_ICC_STATE_CHANGED, prevActivePhoneId,

                0, iccId));

    }



    private int internalIccStateToMessage(String simStatus) {

        switch(simStatus) {

            case IccCardConstants.INTENT_VALUE_ICC_ABSENT: return EVENT_SIM_ABSENT;
@@ -268,7 +279,11 @@ public class SubscriptionInfoUpdater extends Handler { 
                break;



            case EVENT_SIM_ABSENT:

                handleSimAbsent(msg.arg1, msg.arg2);

                handleSimAbsent(msg.arg1);

                break;



            case EVENT_INACTIVE_SLOT_ICC_STATE_CHANGED:

                handleInactiveSlotIccStateChange(msg.arg1, (String) msg.obj);

                break;



            case EVENT_SIM_LOCKED:
@@ -605,10 +620,31 @@ public class SubscriptionInfoUpdater extends Handler { 
        }

    }



    private void handleSimAbsent(int phoneId, int absentAndInactive) {

    /**

     * PhoneId is the corresponding phoneId of the slot if slot was previously active.

     * It could be INVALID if it was already inactive.

     */

    private void handleInactiveSlotIccStateChange(int phoneId, String iccId) {

        // If phoneId is valid, it means the physical slot was active in that phoneId. In this case,

        // we clear (mark inactive) the subscription in db on that phone.

        if (SubscriptionManager.isValidPhoneId(phoneId)) {

            if (sIccId[phoneId] != null && !sIccId[phoneId].equals(ICCID_STRING_FOR_NO_SIM)) {

            logd("SIM" + (phoneId + 1) + " hot plug out, absentAndInactive=" + absentAndInactive);

                logd("Slot of SIM" + (phoneId + 1) + " becomes inactive");

            }

            cleanSubscriptionInPhone(phoneId);

        }

        if (!TextUtils.isEmpty(iccId)) {

            // If iccId is new, add a subscription record in the db.

            String strippedIccId = IccUtils.stripTrailingFs(iccId);

            if (SubscriptionController.getInstance().getSubInfoForIccId(strippedIccId) == null) {

                SubscriptionController.getInstance().insertEmptySubInfoRecord(

                        strippedIccId, "CARD", SubscriptionManager.INVALID_PHONE_INDEX,

                        SubscriptionManager.SUBSCRIPTION_TYPE_LOCAL_SIM);

            }

        }

    }



    private void cleanSubscriptionInPhone(int phoneId) {

        sIccId[phoneId] = ICCID_STRING_FOR_NO_SIM;

        int[] subIds = SubscriptionController.getInstance().getSubId(phoneId);

        if (subIds != null && subIds.length > 0) {
@@ -620,16 +656,24 @@ public class SubscriptionInfoUpdater extends Handler { 
                    SubscriptionController.getSelectionForSubIdList(subIds), null);

        }

        updateSubscriptionInfoByIccId(phoneId, true /* updateEmbeddedSubs */);

        // Do not broadcast if the SIM is absent and inactive, because the logical phoneId here is

        // no longer correct

        if (absentAndInactive == 0) {

    }



    private void handleSimAbsent(int phoneId) {

        if (!SubscriptionManager.isValidPhoneId(phoneId)) {

            logd("handleSimAbsent on invalid phoneId");

            return;

        }

        if (sIccId[phoneId] != null && !sIccId[phoneId].equals(ICCID_STRING_FOR_NO_SIM)) {

            logd("SIM" + (phoneId + 1) + " hot plug out");

        }

        cleanSubscriptionInPhone(phoneId);



        broadcastSimStateChanged(phoneId, IccCardConstants.INTENT_VALUE_ICC_ABSENT, null);

        broadcastSimCardStateChanged(phoneId, TelephonyManager.SIM_STATE_ABSENT);

        broadcastSimApplicationStateChanged(phoneId, TelephonyManager.SIM_STATE_UNKNOWN);

        updateSubscriptionCarrierId(phoneId, IccCardConstants.INTENT_VALUE_ICC_ABSENT);

        updateCarrierServices(phoneId, IccCardConstants.INTENT_VALUE_ICC_ABSENT);

    }

    }



    private void handleSimError(int phoneId) {

        if (sIccId[phoneId] != null && !sIccId[phoneId].equals(ICCID_STRING_FOR_NO_SIM)) {

src/java/com/android/internal/telephony/uicc/UiccController.java

+19 −8
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import android.os.storage.StorageManager; 
import android.preference.PreferenceManager;

import android.sysprop.TelephonyProperties;

import android.telephony.CarrierConfigManager;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.telephony.UiccCardInfo;

import android.text.TextUtils;
@@ -642,23 +643,33 @@ public class UiccController extends Handler { 
        }

    }



    static void updateInternalIccState(Context context, IccCardConstants.State state, String reason,

            int phoneId) {

        updateInternalIccState(context, state, reason, phoneId, false);

    static void updateInternalIccStateForInactiveSlot(

            Context context, int prevActivePhoneId, String iccId) {

        if (SubscriptionManager.isValidPhoneId(prevActivePhoneId)) {

            // Mark SIM state as ABSENT on previously phoneId.

            TelephonyManager telephonyManager = (TelephonyManager) context.getSystemService(

                    Context.TELEPHONY_SERVICE);

            telephonyManager.setSimStateForPhone(prevActivePhoneId,

                    IccCardConstants.State.ABSENT.toString());

        }



        SubscriptionInfoUpdater subInfoUpdator = PhoneFactory.getSubscriptionInfoUpdater();

        if (subInfoUpdator != null) {

            subInfoUpdator.updateInternalIccStateForInactiveSlot(prevActivePhoneId, iccId);

        } else {

            Rlog.e(LOG_TAG, "subInfoUpdate is null.");

        }

    }



    // absentAndInactive is a special case when we need to update subscriptions but don't want to

    // broadcast a state change

    static void updateInternalIccState(Context context, IccCardConstants.State state, String reason,

            int phoneId, boolean absentAndInactive) {

            int phoneId) {

        TelephonyManager telephonyManager = (TelephonyManager) context.getSystemService(

                Context.TELEPHONY_SERVICE);

        telephonyManager.setSimStateForPhone(phoneId, state.toString());



        SubscriptionInfoUpdater subInfoUpdator = PhoneFactory.getSubscriptionInfoUpdater();

        if (subInfoUpdator != null) {

            subInfoUpdator.updateInternalIccState(getIccStateIntentString(state),

                    reason, phoneId, absentAndInactive);

            subInfoUpdator.updateInternalIccState(getIccStateIntentString(state), reason, phoneId);

        } else {

            Rlog.e(LOG_TAG, "subInfoUpdate is null.");

        }

src/java/com/android/internal/telephony/uicc/UiccSlot.java

+1 −3
Original line number Diff line number Diff line
@@ -154,12 +154,10 @@ public class UiccSlot extends Handler { 
            if (iss.slotState == IccSlotStatus.SlotState.SLOTSTATE_INACTIVE) {

                // TODO: (b/79432584) evaluate whether should broadcast card state change

                // even if it's inactive.

                UiccController.updateInternalIccStateForInactiveSlot(mContext, mPhoneId, mIccId);

                if (mActive) {

                    mActive = false;

                    mLastRadioState = TelephonyManager.RADIO_POWER_UNAVAILABLE;

                    UiccController.updateInternalIccState(

                            mContext, IccCardConstants.State.ABSENT, null, mPhoneId,

                            true /* special notification for absent card in an inactive slot */);

                    mPhoneId = INVALID_PHONE_ID;

                    nullifyUiccCard(true /* sim state is unknown */);

                }

tests/telephonytests/src/com/android/internal/telephony/SubscriptionInfoUpdaterTest.java

+14 −15
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ public class SubscriptionInfoUpdaterTest extends TelephonyTest { 
        doReturn(new int[]{FAKE_SUB_ID_1}).when(mSubscriptionController)

                .getActiveSubIdList(/*visibleOnly*/false);

        mUpdater.updateInternalIccState(

                IccCardConstants.INTENT_VALUE_ICC_ABSENT, null, FAKE_SUB_ID_1, false);

                IccCardConstants.INTENT_VALUE_ICC_ABSENT, null, FAKE_SUB_ID_1);



        processAllMessages();

        assertTrue(mUpdater.isSubInfoInitialized());
@@ -204,8 +204,7 @@ public class SubscriptionInfoUpdaterTest extends TelephonyTest { 
                .getSubInfoUsingSlotIndexPrivileged(eq(FAKE_SUB_ID_1));

        doReturn(new int[]{FAKE_SUB_ID_1}).when(mSubscriptionController)

                .getActiveSubIdList(/*visibleOnly*/false);

        mUpdater.updateInternalIccState(

                IccCardConstants.INTENT_VALUE_ICC_ABSENT, null, FAKE_SUB_ID_1, true);

        mUpdater.updateInternalIccStateForInactiveSlot(FAKE_SUB_ID_1, null);



        processAllMessages();

        assertTrue(mUpdater.isSubInfoInitialized());
@@ -225,7 +224,7 @@ public class SubscriptionInfoUpdaterTest extends TelephonyTest { 
    @SmallTest

    public void testSimUnknown() throws Exception {

        mUpdater.updateInternalIccState(

                IccCardConstants.INTENT_VALUE_ICC_UNKNOWN, null, FAKE_SUB_ID_1, false);

                IccCardConstants.INTENT_VALUE_ICC_UNKNOWN, null, FAKE_SUB_ID_1);



        processAllMessages();

        assertFalse(mUpdater.isSubInfoInitialized());
@@ -242,7 +241,7 @@ public class SubscriptionInfoUpdaterTest extends TelephonyTest { 
    @SmallTest

    public void testSimNotReady() throws Exception {

        mUpdater.updateInternalIccState(

                IccCardConstants.INTENT_VALUE_ICC_NOT_READY, null, FAKE_SUB_ID_1, false);

                IccCardConstants.INTENT_VALUE_ICC_NOT_READY, null, FAKE_SUB_ID_1);



        processAllMessages();

        assertFalse(mUpdater.isSubInfoInitialized());
@@ -262,7 +261,7 @@ public class SubscriptionInfoUpdaterTest extends TelephonyTest { 
        doReturn(true).when(mIccCard).isEmptyProfile();



        mUpdater.updateInternalIccState(

                IccCardConstants.INTENT_VALUE_ICC_NOT_READY, null, FAKE_SUB_ID_1, false);

                IccCardConstants.INTENT_VALUE_ICC_NOT_READY, null, FAKE_SUB_ID_1);



        processAllMessages();

        assertTrue(mUpdater.isSubInfoInitialized());
@@ -282,7 +281,7 @@ public class SubscriptionInfoUpdaterTest extends TelephonyTest { 
    @SmallTest

    public void testSimError() throws Exception {

        mUpdater.updateInternalIccState(

                IccCardConstants.INTENT_VALUE_ICC_CARD_IO_ERROR, null, FAKE_SUB_ID_1, false);

                IccCardConstants.INTENT_VALUE_ICC_CARD_IO_ERROR, null, FAKE_SUB_ID_1);



        processAllMessages();

        assertTrue(mUpdater.isSubInfoInitialized());
@@ -299,7 +298,7 @@ public class SubscriptionInfoUpdaterTest extends TelephonyTest { 
    @SmallTest

    public void testWrongSimState() throws Exception {

        mUpdater.updateInternalIccState(

                IccCardConstants.INTENT_VALUE_ICC_IMSI, null, 2, false);

                IccCardConstants.INTENT_VALUE_ICC_IMSI, null, 2);



        processAllMessages();

        assertFalse(mUpdater.isSubInfoInitialized());
@@ -324,7 +323,7 @@ public class SubscriptionInfoUpdaterTest extends TelephonyTest { 
                true);



        mUpdater.updateInternalIccState(

                IccCardConstants.INTENT_VALUE_ICC_LOADED, null, FAKE_SUB_ID_1, false);

                IccCardConstants.INTENT_VALUE_ICC_LOADED, null, FAKE_SUB_ID_1);



        processAllMessages();

        assertTrue(mUpdater.isSubInfoInitialized());
@@ -390,7 +389,7 @@ public class SubscriptionInfoUpdaterTest extends TelephonyTest { 
        doReturn(Arrays.asList(mSubInfo)).when(mSubscriptionController)

                .getSubInfoUsingSlotIndexPrivileged(eq(FAKE_SUB_ID_1));

        mUpdater.updateInternalIccState(

                IccCardConstants.INTENT_VALUE_ICC_LOADED, null, FAKE_SUB_ID_1, false);

                IccCardConstants.INTENT_VALUE_ICC_LOADED, null, FAKE_SUB_ID_1);



        processAllMessages();

        assertTrue(mUpdater.isSubInfoInitialized());
@@ -417,7 +416,7 @@ public class SubscriptionInfoUpdaterTest extends TelephonyTest { 
        doReturn(Arrays.asList(mSubInfo)).when(mSubscriptionController)

                .getSubInfoUsingSlotIndexPrivileged(eq(FAKE_SUB_ID_1));

        mUpdater.updateInternalIccState(

                IccCardConstants.INTENT_VALUE_ICC_LOCKED, "TESTING", FAKE_SUB_ID_1, false);

                IccCardConstants.INTENT_VALUE_ICC_LOCKED, "TESTING", FAKE_SUB_ID_1);



        processAllMessages();

        assertTrue(mUpdater.isSubInfoInitialized());
@@ -467,7 +466,7 @@ public class SubscriptionInfoUpdaterTest extends TelephonyTest { 
        doReturn(Arrays.asList(mSubInfo)).when(mSubscriptionController)

                .getSubInfoUsingSlotIndexPrivileged(eq(FAKE_SUB_ID_1));

        mUpdater.updateInternalIccState(

                IccCardConstants.INTENT_VALUE_ICC_LOADED, null, FAKE_SUB_ID_1, false);

                IccCardConstants.INTENT_VALUE_ICC_LOADED, null, FAKE_SUB_ID_1);



        processAllMessages();

        verify(mSubscriptionManager, times(1)).addSubscriptionInfoRecord(anyString(), anyInt());
@@ -482,7 +481,7 @@ public class SubscriptionInfoUpdaterTest extends TelephonyTest { 
        doReturn("89012604200000000001").when(mIccRecord).getFullIccId();



        mUpdater.updateInternalIccState(

                IccCardConstants.INTENT_VALUE_ICC_LOADED, null, FAKE_SUB_ID_2, false);

                IccCardConstants.INTENT_VALUE_ICC_LOADED, null, FAKE_SUB_ID_2);



        processAllMessages();

        verify(mSubscriptionManager, times(1)).addSubscriptionInfoRecord(eq("89012604200000000000"),
@@ -504,7 +503,7 @@ public class SubscriptionInfoUpdaterTest extends TelephonyTest { 
                new String[]{"89012604200000000000"});



        mUpdater.updateInternalIccState(

                IccCardConstants.INTENT_VALUE_ICC_LOCKED, "TESTING", FAKE_SUB_ID_1, false);

                IccCardConstants.INTENT_VALUE_ICC_LOCKED, "TESTING", FAKE_SUB_ID_1);



        processAllMessages();

        assertTrue(mUpdater.isSubInfoInitialized());
@@ -654,7 +653,7 @@ public class SubscriptionInfoUpdaterTest extends TelephonyTest { 


        // Mock sending a sim loaded for SIM 1

        mUpdater.updateInternalIccState(

                IccCardConstants.INTENT_VALUE_ICC_LOADED, "TESTING", FAKE_SUB_ID_1, false);

                IccCardConstants.INTENT_VALUE_ICC_LOADED, "TESTING", FAKE_SUB_ID_1);



        processAllMessages();