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

Commit a785ee37 authored by Jordan Liu's avatar Jordan Liu
Browse files

Add enhanced 4g lte carrier config default 

This default value needs to be explicitly set.

Test: all tests defined inImsManagerTest pass
Change-Id: I3854c8758047a634c67b3a85116f27659f518af1
parent 54080689

tests/telephonytests/src/com/android/internal/telephony/ims/ImsManagerTest.java

+9 −3
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ public class ImsManagerTest extends TelephonyTest { 


    private void setDefaultValues() {

        mBundle.putBoolean(CarrierConfigManager.KEY_EDITABLE_ENHANCED_4G_LTE_BOOL,

                ENHANCED_4G_ENABLE_DEFAULT_VAL);

                ENHANCED_4G_MODE_EDITABLE);

        mBundle.putBoolean(CarrierConfigManager.KEY_CARRIER_DEFAULT_WFC_IMS_ENABLED_BOOL,

                WFC_IMS_ENABLE_DEFAULT_VAL);

        mBundle.putBoolean(CarrierConfigManager.KEY_CARRIER_DEFAULT_WFC_IMS_ROAMING_ENABLED_BOOL,
@@ -75,9 +75,12 @@ public class ImsManagerTest extends TelephonyTest { 
                WFC_IMS_MODE_DEFAULT_VAL);

        mBundle.putInt(CarrierConfigManager.KEY_CARRIER_DEFAULT_WFC_IMS_ROAMING_MODE_INT,

                WFC_IMS_ROAMING_MODE_DEFAULT_VAL);

        mBundle.putBoolean(CarrierConfigManager.KEY_ENHANCED_4G_LTE_ON_BY_DEFAULT_BOOL,

                ENHANCED_4G_MODE_DEFAULT_VAL);

    }



    private static final boolean ENHANCED_4G_ENABLE_DEFAULT_VAL = true;

    private static final boolean ENHANCED_4G_MODE_DEFAULT_VAL = true;

    private static final boolean ENHANCED_4G_MODE_EDITABLE = true;

    private static final boolean WFC_IMS_ENABLE_DEFAULT_VAL = false;

    private static final boolean WFC_IMS_ROAMING_ENABLE_DEFAULT_VAL = true;

    private static final boolean VT_IMS_ENABLE_DEFAULT_VAL = true;
@@ -102,7 +105,7 @@ public class ImsManagerTest extends TelephonyTest { 
                eq(SubscriptionManager.WFC_IMS_ENABLED),

                anyString());



        assertEquals(ENHANCED_4G_ENABLE_DEFAULT_VAL,

        assertEquals(ENHANCED_4G_MODE_DEFAULT_VAL,

                imsManager.isEnhanced4gLteModeSettingEnabledByUser());

        verify(mSubscriptionController, times(1)).getSubscriptionProperty(

                anyInt(),
@@ -150,6 +153,9 @@ public class ImsManagerTest extends TelephonyTest { 
                eq(SubscriptionManager.VT_IMS_ENABLED),

                eq("0"));



        // enhanced 4g mode must be editable to use setEnhanced4gLteModeSetting

        mBundle.putBoolean(CarrierConfigManager.KEY_EDITABLE_ENHANCED_4G_LTE_BOOL,

                ENHANCED_4G_MODE_EDITABLE);

        imsManager.setEnhanced4gLteModeSetting(true);

        verify(mSubscriptionController, times(1)).setSubscriptionProperty(

                eq(mSubId[0]),