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

Commit 41334fae authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Used default SIM card name instead of empty string am: 6e20534d am: 049faa84 

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



Change-Id: I5012f8861e3afd9706fb3cd55d73fdfe7ef97b79
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0f7416f2 049faa84

src/java/com/android/internal/telephony/subscription/SubscriptionManagerService.java

+4 −0
Original line number Diff line number Diff line
@@ -1068,6 +1068,8 @@ public class SubscriptionManagerService extends ISub.Stub { 
                        int subId = insertSubscriptionInfo(embeddedProfile.getIccid(),

                                SubscriptionManager.INVALID_SIM_SLOT_INDEX,

                                null, SubscriptionManager.SUBSCRIPTION_TYPE_LOCAL_SIM);

                        mSubscriptionDatabaseManager.setDisplayName(subId, mContext.getResources()

                                .getString(R.string.default_card_name, subId));

                        subInfo = mSubscriptionDatabaseManager.getSubscriptionInfoInternal(subId);

                    }
@@ -1344,6 +1346,8 @@ public class SubscriptionManagerService extends ISub.Stub { 
                    // This is a new SIM card. Insert a new record.

                    subId = insertSubscriptionInfo(iccId, phoneId, null,

                            SubscriptionManager.SUBSCRIPTION_TYPE_LOCAL_SIM);

                    mSubscriptionDatabaseManager.setDisplayName(subId,

                            mContext.getResources().getString(R.string.default_card_name, subId));

                } else {

                    subId = subInfo.getSubscriptionId();

                    log("updateSubscription: Found existing subscription. subId= " + subId

tests/telephonytests/src/com/android/internal/telephony/subscription/SubscriptionManagerServiceTest.java

+9 −6
Original line number Diff line number Diff line
@@ -173,6 +173,8 @@ public class SubscriptionManagerServiceTest extends TelephonyTest { 
        mContextFixture.putBooleanResource(com.android.internal.R.bool

                .config_subscription_database_async_update, true);

        mContextFixture.putIntArrayResource(com.android.internal.R.array.sim_colors, new int[0]);

        mContextFixture.putResource(com.android.internal.R.string.default_card_name,

                FAKE_DEFAULT_CARD_NAME);



        mContextFixture.addSystemFeature(PackageManager.FEATURE_TELEPHONY_EUICC);

        setupMocksForTelephonyPermissions(Build.VERSION_CODES.UPSIDE_DOWN_CAKE);
@@ -1870,12 +1872,16 @@ public class SubscriptionManagerServiceTest extends TelephonyTest { 
        assertThat(mSubscriptionManagerServiceUT.getSlotIndex(1)).isEqualTo(0);

        assertThat(mSubscriptionManagerServiceUT.getPhoneId(1)).isEqualTo(0);



        SubscriptionInfoInternal subInfo = mSubscriptionManagerServiceUT

                .getSubscriptionInfoInternal(1);

        assertThat(subInfo.getDisplayName()).isEqualTo("CARD 1");



        mSubscriptionManagerServiceUT.setCarrierId(1, FAKE_CARRIER_ID1);

        mSubscriptionManagerServiceUT.setDisplayNameUsingSrc(FAKE_CARRIER_NAME1, 1,

                SubscriptionManager.NAME_SOURCE_SIM_SPN);

        mSubscriptionManagerServiceUT.setCarrierName(1, FAKE_CARRIER_NAME1);



        SubscriptionInfoInternal subInfo = mSubscriptionManagerServiceUT

        subInfo = mSubscriptionManagerServiceUT

                .getSubscriptionInfoInternal(1);

        assertThat(subInfo.getSubscriptionId()).isEqualTo(1);

        assertThat(subInfo.getSimSlotIndex()).isEqualTo(0);
@@ -2193,9 +2199,6 @@ public class SubscriptionManagerServiceTest extends TelephonyTest { 


    @Test

    public void testInactiveSimInserted() {

        mContextFixture.putResource(com.android.internal.R.string.default_card_name,

                FAKE_DEFAULT_CARD_NAME);



        doReturn(0).when(mUiccSlot).getPortIndexFromIccId(eq(FAKE_ICCID1));



        mContextFixture.addCallingOrSelfPermission(Manifest.permission.READ_PRIVILEGED_PHONE_STATE);
@@ -2373,7 +2376,7 @@ public class SubscriptionManagerServiceTest extends TelephonyTest { 
                .getSubscriptionInfoInternal(1);

        assertThat(subInfo.getSubscriptionId()).isEqualTo(1);

        assertThat(subInfo.getIccId()).isEqualTo(FAKE_ICCID1);

        assertThat(subInfo.getDisplayName()).isEqualTo("");

        assertThat(subInfo.getDisplayName()).isEqualTo("CARD 1");

        assertThat(subInfo.getDisplayNameSource()).isEqualTo(

                SubscriptionManager.NAME_SOURCE_UNKNOWN);

        assertThat(subInfo.getMcc()).isEqualTo("");
@@ -2385,7 +2388,7 @@ public class SubscriptionManagerServiceTest extends TelephonyTest { 
        subInfo = mSubscriptionManagerServiceUT.getSubscriptionInfoInternal(2);

        assertThat(subInfo.getSubscriptionId()).isEqualTo(2);

        assertThat(subInfo.getIccId()).isEqualTo(FAKE_ICCID2);

        assertThat(subInfo.getDisplayName()).isEqualTo("");

        assertThat(subInfo.getDisplayName()).isEqualTo("CARD 2");

        assertThat(subInfo.getDisplayNameSource()).isEqualTo(

                SubscriptionManager.NAME_SOURCE_UNKNOWN);

        assertThat(subInfo.getMcc()).isEqualTo(FAKE_MCC2);