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

Commit cba59432 authored by Jack Yu's avatar Jack Yu
Browse files

resolve merge conflicts of 80a0e6d5 to nyc-mr2-dev-plus-aosp 

Test: telephony unit tests
Change-Id: Id4454c97eca5f0261001369d0ec5030775bf9887
parents b011af95 80a0e6d5

telephony/java/android/telephony/CarrierConfigManager.java

+9 −0
Original line number Diff line number Diff line
@@ -293,6 +293,14 @@ public class CarrierConfigManager { 
     */

    public static final String KEY_DEFAULT_VM_NUMBER_STRING = "default_vm_number_string";



    /**

     * Flag indicating whether we should downgrade/terminate VT calls and disable VT when

     * data enabled changed (e.g. reach data limit or turn off data).

     * @hide

     */

    public static final String KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS =

            "ignore_data_enabled_changed_for_video_calls";



    /**

     * Flag specifying whether WFC over IMS should be available for carrier: independent of

     * carrier provisioning. If false: hard disabled. If true: then depends on carrier
@@ -1058,6 +1066,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_NOTIFY_HANDOVER_VIDEO_FROM_WIFI_TO_LTE_BOOL, false);

        sDefaults.putBoolean(KEY_SUPPORT_DOWNGRADE_VT_TO_AUDIO_BOOL, true);

        sDefaults.putString(KEY_DEFAULT_VM_NUMBER_STRING, "");

        sDefaults.putBoolean(KEY_IGNORE_DATA_ENABLED_CHANGED_FOR_VIDEO_CALLS, false);

        sDefaults.putBoolean(KEY_CARRIER_WFC_IMS_AVAILABLE_BOOL, false);

        sDefaults.putBoolean(KEY_CARRIER_WFC_SUPPORTS_WIFI_ONLY_BOOL, false);

        sDefaults.putBoolean(KEY_CARRIER_DEFAULT_WFC_IMS_ENABLED_BOOL, false);