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

Commit 22171a9c authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update SubscriptionController on NOT_READY only if it is terminal... 

Merge "Update SubscriptionController on NOT_READY only if it is terminal state." into sc-dev am: 54a246d9

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

Change-Id: I8629500eeb2bc106381a07e1a30411415946c6e3
parents fa6f4b6a 54a246d9

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -457,10 +457,10 @@ public class SubscriptionInfoUpdater extends Handler { 
            // At this phase, the subscription list is accessible. Treating NOT_READY

            // At this phase, the subscription list is accessible. Treating NOT_READY

            // as equivalent to ABSENT, once the rest of the system can handle it.

            // as equivalent to ABSENT, once the rest of the system can handle it.

            sIccId[phoneId] = ICCID_STRING_FOR_NO_SIM;

            sIccId[phoneId] = ICCID_STRING_FOR_NO_SIM;

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

        } else {

        } else {

            sIccId[phoneId] = null;

            sIccId[phoneId] = null;

        }

        }

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





        broadcastSimStateChanged(phoneId, IccCardConstants.INTENT_VALUE_ICC_NOT_READY,

        broadcastSimStateChanged(phoneId, IccCardConstants.INTENT_VALUE_ICC_NOT_READY,

                null);

                null);

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -246,8 +246,8 @@ public class SubscriptionInfoUpdaterTest extends TelephonyTest { 
                mContext.getSystemService(Context.CARRIER_CONFIG_SERVICE);

                mContext.getSystemService(Context.CARRIER_CONFIG_SERVICE);

        verify(mConfigManager, never()).updateConfigForPhoneId(eq(FAKE_PHONE_ID_1),

        verify(mConfigManager, never()).updateConfigForPhoneId(eq(FAKE_PHONE_ID_1),

                eq(IccCardConstants.INTENT_VALUE_ICC_NOT_READY));

                eq(IccCardConstants.INTENT_VALUE_ICC_NOT_READY));

        verify(mSubscriptionController).clearSubInfoRecord(FAKE_PHONE_ID_1);

        verify(mSubscriptionController, never()).clearSubInfoRecord(FAKE_PHONE_ID_1);

        verify(mSubscriptionController).notifySubscriptionInfoChanged();

        verify(mSubscriptionController, never()).notifySubscriptionInfoChanged();

    }

    }





    @Test

    @Test