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

Commit b373c6e3 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'am-0fee4bce4d374519bf38ae18517a4d79' into nyc-mr1-dev-plus-aosp 

* changes:
  Merge "Support auto-downgrade to audio when data disabled." into nyc-mr1-dev am: 76c973cd am: 464eb123
  Support auto-downgrade to audio when data disabled. am: 86d5c3fc am: 6c678716
parents b9709340 9b4da390

telephony/java/android/telephony/CarrierConfigManager.java

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

    public static final String KEY_CARRIER_VT_AVAILABLE_BOOL = "carrier_vt_available_bool";



    /**

     * Flag specifying whether the carrier supports downgrading a video call (tx, rx or tx/rx)

     * directly to an audio call.

     * @hide

     */

    public static final String KEY_SUPPORT_DOWNGRADE_VT_TO_AUDIO_BOOL =

            "support_downgrade_vt_to_audio_bool";



    /**

     * 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
@@ -927,6 +935,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_CARRIER_SETTINGS_ENABLE_BOOL, false);

        sDefaults.putBoolean(KEY_CARRIER_VOLTE_AVAILABLE_BOOL, false);

        sDefaults.putBoolean(KEY_CARRIER_VT_AVAILABLE_BOOL, false);

        sDefaults.putBoolean(KEY_SUPPORT_DOWNGRADE_VT_TO_AUDIO_BOOL, true);

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

telephony/java/android/telephony/TelephonyManager.java

+22 −0
Original line number Diff line number Diff line
@@ -715,6 +715,28 @@ public class TelephonyManager { 
    public static final String EVENT_HANDOVER_TO_WIFI_FAILED =

            "android.telephony.event.EVENT_HANDOVER_TO_WIFI_FAILED";



    /**

     * {@link android.telecom.Connection} event used to indicate that a video call was downgraded to

     * audio because the data limit was reached.

     * <p>

     * Sent via {@link android.telecom.Connection#sendConnectionEvent(String, Bundle)}.

     * The {@link Bundle} parameter is expected to be null when this connection event is used.

     * @hide

     */

    public static final String EVENT_DOWNGRADE_DATA_LIMIT_REACHED =

            "android.telephony.event.EVENT_DOWNGRADE_DATA_LIMIT_REACHED";



    /**

     * {@link android.telecom.Connection} event used to indicate that a video call was downgraded to

     * audio because the data was disabled.

     * <p>

     * Sent via {@link android.telecom.Connection#sendConnectionEvent(String, Bundle)}.

     * The {@link Bundle} parameter is expected to be null when this connection event is used.

     * @hide

     */

    public static final String EVENT_DOWNGRADE_DATA_DISABLED =

            "android.telephony.event.EVENT_DOWNGRADE_DATA_DISABLED";



    /**

     * Response codes for sim activation. Activation completed successfully.

     * @hide