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

Commit ffb72473 authored by Tyler Gunn's avatar Tyler Gunn Committed by Android (Google) Code Review
Browse files

Merge "Remove EXTRA_CALL_HISTORY_INFO." into mnc-dr-dev

parents ef7deb90 ac2aefc3

telecomm/java/android/telecom/Connection.java

+0 −6
Original line number Diff line number Diff line
@@ -252,12 +252,6 @@ public abstract class Connection extends Conferenceable { 
    // Next CAPABILITY value: 0x00400000

    //**********************************************************************************************



    /**

     * TODO: Remove this -- retained so the build won't break.  However, future work will remove it.

     * @hide

     */

    public static final String EXTRA_CALL_HISTORY_INFO = "android.telecom.EXTRA_CALL_HISTORY_INFO";



    /**

     * Connection extra key used to store the last forwarded number associated with the current

     * connection.  Used to communicate to the user interface that the connection was forwarded via

telephony/java/android/telephony/CarrierConfigManager.java

+9 −0
Original line number Diff line number Diff line
@@ -258,6 +258,14 @@ public class CarrierConfigManager { 
    public static final String KEY_CARRIER_ALLOW_TURNOFF_IMS_BOOL

            = "carrier_allow_turnoff_ims_bool";



    /**

     * Flag specifying whether IMS instant lettering is available for the carrier.  {@code True} if

     * instant lettering is available for the carrier, {@code false} otherwise.

     * @hide

     */

    public static final String KEY_CARRIER_INSTANT_LETTERING_AVAILABLE_BOOL =

            "carrier_instant_lettering_available_bool";



    /**

     * If Voice Radio Technology is RIL_RADIO_TECHNOLOGY_LTE:14 or RIL_RADIO_TECHNOLOGY_UNKNOWN:0

     * this is the value that should be used instead. A configuration value of
@@ -393,6 +401,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOL, false);

        sDefaults.putBoolean(KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL, true);

        sDefaults.putBoolean(KEY_CARRIER_ALLOW_TURNOFF_IMS_BOOL, true);

        sDefaults.putBoolean(KEY_CARRIER_INSTANT_LETTERING_AVAILABLE_BOOL, false);

        sDefaults.putBoolean(KEY_DISABLE_CDMA_ACTIVATION_CODE_BOOL, false);

        sDefaults.putBoolean(KEY_DTMF_TYPE_ENABLED_BOOL, false);

        sDefaults.putBoolean(KEY_ENABLE_DIALER_KEY_VIBRATION_BOOL, true);