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

Commit 16177554 authored by Jack Yu's avatar Jack Yu Committed by Android (Google) Code Review
Browse files

Merge "Cleaned up the flag reset_primary_sim_default_values" into main

parents 7fcd0ee3 783c6c86

flags/subscription.aconfig

+0 −12
Original line number Diff line number Diff line
@@ -46,18 +46,6 @@ flag { 
  bug: "325045841"

}



# OWNER=songferngwang TARGET=24Q3

flag {

  name: "reset_primary_sim_default_values"

  namespace: "telephony"

  description: "Reset the default values to the remaining sim"

  bug: "339394518"



  metadata {

    purpose: PURPOSE_BUGFIX

  }

}



# OWNER=jmattis TARGET=25Q2

flag {

  name: "subscription_plan_allow_status_and_end_date"

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

+1 −4
Original line number Diff line number Diff line
@@ -648,10 +648,7 @@ public class MultiSimSettingController extends Handler { 
        // Otherwise, if user just inserted their first SIM, or there's one primary and one

        // opportunistic subscription active (activeSubInfos.size() > 1), we automatically

        // set the primary to be default SIM and return.

        boolean conditionForOnePrimarySim =

                mFeatureFlags.resetPrimarySimDefaultValues() ? mPrimarySubList.size() == 1

                        : mPrimarySubList.size() == 1

                        && (change != PRIMARY_SUB_REMOVED || mActiveModemCount == 1);

        boolean conditionForOnePrimarySim = mPrimarySubList.size() == 1;

        if (conditionForOnePrimarySim) {

            int subId = mPrimarySubList.get(0);

            if (DBG) log("updateDefaultValues: to only primary sub " + subId);

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

+0 −2
Original line number Diff line number Diff line
@@ -249,8 +249,6 @@ public class MultiSimSettingControllerTest extends TelephonyTest { 
        bundle.putBoolean(CarrierConfigManager.KEY_CARRIER_CONFIG_APPLIED_BOOL, true);

        doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(anyInt());



        doReturn(true).when(mFeatureFlags).resetPrimarySimDefaultValues();



        replaceInstance(PhoneFactory.class, "sPhones", null, mPhones);

        // Capture listener to emulate the carrier config change notification used later

        ArgumentCaptor<CarrierConfigManager.CarrierConfigChangeListener> listenerArgumentCaptor =