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

Commit f6d865fd authored by Derek Tan's avatar Derek Tan
Browse files

Use getConfigForSubId instead of getConfig(int). 

Per API review, we want to revert getConfig(int) to
getConfigForSubId(int) (ag/1075011). This CL changes all
callers to use getConfigForSubId(int).

Bug: 28295813
Change-Id: Ib55064226da5371d5acf014c0e0c20f3724d02c4
parent 4ac3b86a

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

+1 −1
Original line number Diff line number Diff line
@@ -2149,7 +2149,7 @@ public class ServiceStateTracker extends Handler { 
                        mPhone.getContext().getSystemService(Context.CARRIER_CONFIG_SERVICE);

                if (configLoader != null) {

                    try {

                        PersistableBundle b = configLoader.getConfig(mPhone.getSubId());

                        PersistableBundle b = configLoader.getConfigForSubId(mPhone.getSubId());

                        if (b != null) {

                            voiceIdx = b.getInt(CarrierConfigManager.KEY_WFC_SPN_FORMAT_IDX_INT);

                            dataIdx = b.getInt(

src/java/com/android/internal/telephony/cdma/EriManager.java

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ public class EriManager { 
            CarrierConfigManager configManager = (CarrierConfigManager)

                    mContext.getSystemService(Context.CARRIER_CONFIG_SERVICE);

            if (configManager != null) {

                PersistableBundle b = configManager.getConfig(mPhone.getSubId());

                PersistableBundle b = configManager.getConfigForSubId(mPhone.getSubId());

                if (b != null) {

                    eriFile = b.getString(CarrierConfigManager.KEY_CARRIER_ERI_FILE_NAME_STRING);

                }

src/java/com/android/internal/telephony/dataconnection/ApnSetting.java

+1 −1
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ public class ApnSetting { 
                    return true;

                }



                PersistableBundle b = configManager.getConfig(subId);

                PersistableBundle b = configManager.getConfigForSubId(subId);

                if (b == null) {

                    Rlog.e(LOG_TAG, "Can't get the config. subId = " + subId);

                    return true;

src/java/com/android/internal/telephony/imsphone/ImsPhone.java

+1 −1
Original line number Diff line number Diff line
@@ -1463,7 +1463,7 @@ public class ImsPhone extends ImsPhoneBase { 
                Rlog.e(LOG_TAG, "processDisconnectReason: CarrierConfigManager is not ready");

                return;

            }

            PersistableBundle pb = configManager.getConfig(getSubId());

            PersistableBundle pb = configManager.getConfigForSubId(getSubId());

            if (pb == null) {

                Rlog.e(LOG_TAG, "processDisconnectReason: no config for subId " + getSubId());

                return;

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

+0 −1
Original line number Diff line number Diff line
@@ -488,7 +488,6 @@ public class ContextFixture implements TestFixture<Context> { 
        }).when(mPackageManager).queryIntentServicesAsUser((Intent) any(), anyInt(), anyInt());



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

        doReturn(mBundle).when(mCarrierConfigManager).getConfig(anyInt());



        mConfiguration.locale = Locale.US;

        doReturn(mConfiguration).when(mResources).getConfiguration();