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

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

Merge changes from topic "remove_obsolete" into main am: ad691920 

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



Change-Id: I966b2f330bddb79c889cc61002834f7b6dae628f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 48f34c74 ad691920

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

+3 −2
Original line number Diff line number Diff line
@@ -3838,9 +3838,10 @@ public class SubscriptionManagerService extends ISub.Stub { 
                    // If iccId is new, add a subscription record in the database so it can be

                    // activated later. (Pre-U behavior)

                    subId = insertSubscriptionInfo(IccUtils.stripTrailingFs(iccId),

                            SubscriptionManager.INVALID_SIM_SLOT_INDEX,

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

                            SubscriptionManager.INVALID_SIM_SLOT_INDEX, "",

                            SubscriptionManager.SUBSCRIPTION_TYPE_LOCAL_SIM);

                    mSubscriptionDatabaseManager.setDisplayName(subId,

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

                    log("updateSimStateForInactivePort: Insert a new subscription for inactive SIM."

                            + " subId=" + subId);

                }

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

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ import java.util.concurrent.Executor; 
@TestableLooper.RunWithLooper

public class SubscriptionDatabaseManagerTest extends TelephonyTest {



    static final String FAKE_DEFAULT_CARD_NAME = "CARD NAME";

    static final String FAKE_DEFAULT_CARD_NAME = "CARD %d";

    static final String FAKE_ICCID1 = "123456";

    static final String FAKE_ICCID2 = "456789";

    static final String FAKE_PHONE_NUMBER1 = "6502530000";

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

+1 −1
Original line number Diff line number Diff line
@@ -2202,7 +2202,7 @@ public class SubscriptionManagerServiceTest extends TelephonyTest { 
                .getSubscriptionInfoInternal(1);

        assertThat(subInfo.getSimSlotIndex()).isEqualTo(SubscriptionManager.INVALID_SIM_SLOT_INDEX);

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

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

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

        assertThat(subInfo.getPortIndex()).isEqualTo(0);

    }