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

Commit 1cee477b authored by Tyler Gunn's avatar Tyler Gunn
Browse files

Merge commit '024557b2' into tgunn-mncvtdev-to-master-2015-12-04 

Change-Id: I156930f72a3267b59123469231331e9da5ac6aab
parents 66bf567e 024557b2

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -37391,6 +37391,8 @@ package android.telephony { 
    method public void notifyConfigChangedForSubId(int);

    method public void updateConfigForPhoneId(int, java.lang.String);

    field public static final java.lang.String ACTION_CARRIER_CONFIG_CHANGED = "android.telephony.action.CARRIER_CONFIG_CHANGED";

    final java.lang.String BOOL_ALLOW_EMERGENCY_VIDEO_CALLS = "bool_allow_emergency_video_calls";

    field public static final java.lang.String BOOL_ALLOW_VIDEO_PAUSE = "bool_allow_video_pause";

    field public static final java.lang.String KEY_ADDITIONAL_CALL_SETTING_BOOL = "additional_call_setting_bool";

    field public static final java.lang.String KEY_ALLOW_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL = "allow_emergency_numbers_in_call_log_bool";

    field public static final java.lang.String KEY_ALLOW_LOCAL_DTMF_TONES_BOOL = "allow_local_dtmf_tones_bool";

telephony/java/android/telephony/CarrierConfigManager.java

+26 −0
Original line number Diff line number Diff line
@@ -524,6 +524,30 @@ public class CarrierConfigManager { 
    public static final String KEY_ALLOW_NON_EMERGENCY_CALLS_IN_ECM_BOOL =

            "allow_non_emergency_calls_in_ecm_bool";



    /**

     * Flag indicating whether to allow carrier video calls to emergency numbers.

     * When {@code true}, video calls to emergency numbers will be allowed.  When {@code false},

     * video calls to emergency numbers will be initiated as audio-only calls instead.

     *

     * @hide

     */

    @SystemApi

    public static final String BOOL_ALLOW_EMERGENCY_VIDEO_CALLS =

            "bool_allow_emergency_video_calls";



    /**

     * Flag indicating whether the carrier supports video pause signaling.  When {@code true}, the

     * carrier supports use of the {@link android.telecom.VideoProfile#STATE_PAUSED} video state

     * to pause transmission of video when the In-Call app is sent to the background.

     * When {@code false}, video pause signaling is not supported.  {@code True} by default unless

     * a carrier configuration overrides the default.

     *

     * @hide

     */

    @SystemApi

    public static final String BOOL_ALLOW_VIDEO_PAUSE =

            "bool_allow_video_pause";



    /** The default value for every variable. */

    private final static PersistableBundle sDefaults;
@@ -596,6 +620,8 @@ public class CarrierConfigManager { 
        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);

        sDefaults.putBoolean(BOOL_ALLOW_EMERGENCY_VIDEO_CALLS, false);

        sDefaults.putBoolean(BOOL_ALLOW_VIDEO_PAUSE, true);



        // MMS defaults

        sDefaults.putBoolean(KEY_MMS_ALIAS_ENABLED_BOOL, false);