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

Commit de28b7cd authored by Amit Mahajan's avatar Amit Mahajan Committed by android-build-merger
Browse files

Merge "Trigger pollState() on carrier config changed for GSM as well." am:... 

Merge "Trigger pollState() on carrier config changed for GSM as well." am: 61f96a7e am: 2fea71e2
am: 141102a4

Change-Id: Ifcb5d27c1329c7580cc315d4629c8bb7efccbc2d
parents b1435557 141102a4

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

+1 −3
Original line number Diff line number Diff line
@@ -2346,9 +2346,7 @@ public class GsmCdmaPhone extends Phone { 


                // Load the ERI based on carrier config. Carrier might have their specific ERI.

                prepareEri();

                if (!isPhoneTypeGsm()) {

                mSST.pollState();

                }



                break;

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

+6 −1
Original line number Diff line number Diff line
@@ -149,14 +149,19 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 
    @Test

    @SmallTest

    public void testHandleActionCarrierConfigChanged() {

        Intent intent = new Intent(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED);

        mContext.sendBroadcast(intent);

        waitForMs(50);

        verify(mSST, times(1)).pollState();



        // set voice radio tech in RIL to 1xRTT. ACTION_CARRIER_CONFIG_CHANGED should trigger a

        // query and change phone type

        mSimulatedCommands.setVoiceRadioTech(ServiceState.RIL_RADIO_TECHNOLOGY_1xRTT);

        assertTrue(mPhoneUT.isPhoneTypeGsm());

        Intent intent = new Intent(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED);

        mContext.sendBroadcast(intent);

        waitForMs(50);

        assertTrue(mPhoneUT.isPhoneTypeCdmaLte());

        verify(mSST, times(2)).pollState();

    }



    @Test