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

Commit 9e1b2060 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Show GSM settings with CDMA phone type" into main

parents d16d627a 7abc384e

src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java

+1 −2
Original line number Diff line number Diff line
@@ -100,8 +100,7 @@ public class ImeiInfoDialogController { 


        mDialog.setText(ID_PRL_VERSION_VALUE, getCdmaPrlVersion());



        if ((mSubscriptionInfo != null && isCdmaLteEnabled()) ||

                    (mSubscriptionInfo == null && isSimPresent(mSlotId))) {

        if (isCdmaLteEnabled()) {

            // Show IMEI for LTE device

            mDialog.setText(ID_IMEI_VALUE, mTelephonyManager.getImei(mSlotId));

            mDialog.setText(ID_IMEI_SV_VALUE,

tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java

+0 −30
Original line number Diff line number Diff line
@@ -142,36 +142,6 @@ public class ImeiInfoDialogControllerTest { 
        verify(mDialog).removeViewFromScreen(ID_GSM_SETTINGS);

    }



    @Test

    public void populateImeiInfo_cdmaSimPresent_shouldSetImeiInfoAndSetAllCdmaSetting() {

        ReflectionHelpers.setField(mController, "mSubscriptionInfo", null);

        when(mTelephonyManager.getPhoneType()).thenReturn(TelephonyManager.PHONE_TYPE_CDMA);

        when(mTelephonyManager.getSimState(anyInt())).thenReturn(

                TelephonyManager.SIM_STATE_PRESENT);



        mController.populateImeiInfo();



        verify(mDialog).setText(ID_MEID_NUMBER_VALUE, MEID_NUMBER);

        verify(mDialog).setText(ID_MIN_NUMBER_VALUE, "");

        verify(mDialog).setText(ID_PRL_VERSION_VALUE, "");

        verify(mDialog).setText(eq(ID_IMEI_VALUE), any());

        verify(mDialog).setText(eq(ID_IMEI_SV_VALUE), any());

    }



    @Test

    public void populateImeiInfo_cdmaSimABSENT_shouldSetImeiInfoAndSetAllCdmaSetting() {

        ReflectionHelpers.setField(mController, "mSubscriptionInfo", null);

        when(mTelephonyManager.getPhoneType()).thenReturn(TelephonyManager.PHONE_TYPE_CDMA);

        when(mTelephonyManager.getSimState(anyInt())).thenReturn(TelephonyManager.SIM_STATE_ABSENT);



        mController.populateImeiInfo();



        verify(mDialog).setText(ID_MEID_NUMBER_VALUE, MEID_NUMBER);

        verify(mDialog).setText(ID_MIN_NUMBER_VALUE, "");

        verify(mDialog).setText(ID_PRL_VERSION_VALUE, "");

        verify(mDialog).removeViewFromScreen(ID_GSM_SETTINGS);

    }



    @Test

    public void populateImeiInfo_gsmSimDisabled_shouldSetImeiAndRemoveCdmaSettings() {

        ReflectionHelpers.setField(mController, "mSubscriptionInfo", null);