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

Commit e6d5a19e authored by Hall Liu's avatar Hall Liu Committed by Android (Google) Code Review
Browse files

Merge "Adds carrier config to determine if high definition audio is displayed" into nyc-mr2-dev

parents 23c46fb1 f84a9661

telephony/java/android/telephony/CarrierConfigManager.java

+10 −0
Original line number Diff line number Diff line
@@ -598,6 +598,15 @@ public class CarrierConfigManager { 
     */

    public static final String KEY_SUPPORT_CONFERENCE_CALL_BOOL = "support_conference_call_bool";



    /**

     * Determines whether High Definition audio property is displayed in the dialer UI.

     * If {@code false}, remove the HD audio property from the connection so that HD audio related

     * UI is not displayed. If {@code true}, keep HD audio property as it is configured.

     * @hide

     */

    public static final String KEY_DISPLAY_HD_AUDIO_PROPERTY_BOOL =

            "display_hd_audio_property_bool";



    /**

     * Determines whether video conference calls are supported by a carrier.  When {@code true},

     * video calls can be merged into conference calls, {@code false} otherwiwse.
@@ -1130,6 +1139,7 @@ public class CarrierConfigManager { 
        sDefaults.putInt(KEY_CDMA_DTMF_TONE_DELAY_INT, 100);

        sDefaults.putBoolean(KEY_SUPPORT_CONFERENCE_CALL_BOOL, true);

        sDefaults.putBoolean(KEY_SUPPORT_VIDEO_CONFERENCE_CALL_BOOL, false);

        sDefaults.putBoolean(KEY_DISPLAY_HD_AUDIO_PROPERTY_BOOL, true);

        sDefaults.putBoolean(KEY_EDITABLE_ENHANCED_4G_LTE_BOOL, true);

        sDefaults.putBoolean(KEY_HIDE_IMS_APN_BOOL, false);

        sDefaults.putBoolean(KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL, false);