Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tyler Gunn
2015-08-05 17:47:14 +00:00
committed by Android (Google) Code Review
parent ef7deb90ac ac2aefc37b
commit ffb72473c6
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
telecomm/java/android/telecom/Connection.java
View File

@@ -252,12 +252,6 @@ public abstract class Connection extends Conferenceable {
// Next CAPABILITY value: 0x00400000 // 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 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 * connection. Used to communicate to the user interface that the connection was forwarded via

9
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -258,6 +258,14 @@ public class CarrierConfigManager {
public static final String KEY_CARRIER_ALLOW_TURNOFF_IMS_BOOL public static final String KEY_CARRIER_ALLOW_TURNOFF_IMS_BOOL
= "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 * 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 * 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_PROVISIONING_REQUIRED_BOOL, false);
sDefaults.putBoolean(KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL, true); sDefaults.putBoolean(KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL, true);
sDefaults.putBoolean(KEY_CARRIER_ALLOW_TURNOFF_IMS_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_DISABLE_CDMA_ACTIVATION_CODE_BOOL, false);
sDefaults.putBoolean(KEY_DTMF_TYPE_ENABLED_BOOL, false); sDefaults.putBoolean(KEY_DTMF_TYPE_ENABLED_BOOL, false);
sDefaults.putBoolean(KEY_ENABLE_DIALER_KEY_VIBRATION_BOOL, true); sDefaults.putBoolean(KEY_ENABLE_DIALER_KEY_VIBRATION_BOOL, true);