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

Commit fc125a31 authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

Merge "Adds carrier config to determine if high definition audio is displayed" 

am: 26e50963

Change-Id: I2ce0958075ec3bd2c337993516ad06ffd264d594
parents e6164ca7 26e50963

telephony/java/android/telephony/CarrierConfigManager.java

+10 −0
Original line number Diff line number Diff line
@@ -625,6 +625,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.
@@ -1155,6 +1164,7 @@ public class CarrierConfigManager { 
        sDefaults.putInt(KEY_CDMA_3WAYCALL_FLASH_DELAY_INT , 0);

        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);