Merge "Correct naming issues with video calling carrier config items." into nyc-dev (2e9438ad) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -36716,11 +36716,10 @@ package android.telephony {
	method public void notifyConfigChanged(int);		method public void notifyConfigChanged(int);
	method public deprecated void notifyConfigChangedForSubId(int);		method public deprecated void notifyConfigChangedForSubId(int);
	field public static final java.lang.String ACTION_CARRIER_CONFIG_CHANGED = "android.telephony.action.CARRIER_CONFIG_CHANGED";		field public static final java.lang.String ACTION_CARRIER_CONFIG_CHANGED = "android.telephony.action.CARRIER_CONFIG_CHANGED";
	field public static 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_ADDITIONAL_CALL_SETTING_BOOL = "additional_call_setting_bool";
	field public static final java.lang.String KEY_ALLOW_ADDING_APNS_BOOL = "allow_adding_apns_bool";		field public static final java.lang.String KEY_ALLOW_ADDING_APNS_BOOL = "allow_adding_apns_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_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL = "allow_emergency_numbers_in_call_log_bool";
			field public static final java.lang.String KEY_ALLOW_EMERGENCY_VIDEO_CALLS_BOOL = "allow_emergency_video_calls_bool";
	field public static final java.lang.String KEY_ALLOW_LOCAL_DTMF_TONES_BOOL = "allow_local_dtmf_tones_bool";		field public static final java.lang.String KEY_ALLOW_LOCAL_DTMF_TONES_BOOL = "allow_local_dtmf_tones_bool";
	field public static final java.lang.String KEY_ALLOW_NON_EMERGENCY_CALLS_IN_ECM_BOOL = "allow_non_emergency_calls_in_ecm_bool";		field public static final java.lang.String KEY_ALLOW_NON_EMERGENCY_CALLS_IN_ECM_BOOL = "allow_non_emergency_calls_in_ecm_bool";
	field public static final java.lang.String KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOL = "always_show_emergency_alert_onoff_bool";		field public static final java.lang.String KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOL = "always_show_emergency_alert_onoff_bool";

api/system-current.txt

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -39377,11 +39377,10 @@ package android.telephony {
	method public deprecated void notifyConfigChangedForSubId(int);		method public deprecated void notifyConfigChangedForSubId(int);
	method public void updateConfigForPhoneId(int, java.lang.String);		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";		field public static final java.lang.String ACTION_CARRIER_CONFIG_CHANGED = "android.telephony.action.CARRIER_CONFIG_CHANGED";
	field public static 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_ADDITIONAL_CALL_SETTING_BOOL = "additional_call_setting_bool";
	field public static final java.lang.String KEY_ALLOW_ADDING_APNS_BOOL = "allow_adding_apns_bool";		field public static final java.lang.String KEY_ALLOW_ADDING_APNS_BOOL = "allow_adding_apns_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_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL = "allow_emergency_numbers_in_call_log_bool";
			field public static final java.lang.String KEY_ALLOW_EMERGENCY_VIDEO_CALLS_BOOL = "allow_emergency_video_calls_bool";
	field public static final java.lang.String KEY_ALLOW_LOCAL_DTMF_TONES_BOOL = "allow_local_dtmf_tones_bool";		field public static final java.lang.String KEY_ALLOW_LOCAL_DTMF_TONES_BOOL = "allow_local_dtmf_tones_bool";
	field public static final java.lang.String KEY_ALLOW_NON_EMERGENCY_CALLS_IN_ECM_BOOL = "allow_non_emergency_calls_in_ecm_bool";		field public static final java.lang.String KEY_ALLOW_NON_EMERGENCY_CALLS_IN_ECM_BOOL = "allow_non_emergency_calls_in_ecm_bool";
	field public static final java.lang.String KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOL = "always_show_emergency_alert_onoff_bool";		field public static final java.lang.String KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOL = "always_show_emergency_alert_onoff_bool";

api/test-current.txt

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -36778,11 +36778,10 @@ package android.telephony {
	method public void notifyConfigChanged(int);		method public void notifyConfigChanged(int);
	method public deprecated void notifyConfigChangedForSubId(int);		method public deprecated void notifyConfigChangedForSubId(int);
	field public static final java.lang.String ACTION_CARRIER_CONFIG_CHANGED = "android.telephony.action.CARRIER_CONFIG_CHANGED";		field public static final java.lang.String ACTION_CARRIER_CONFIG_CHANGED = "android.telephony.action.CARRIER_CONFIG_CHANGED";
	field public static 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_ADDITIONAL_CALL_SETTING_BOOL = "additional_call_setting_bool";
	field public static final java.lang.String KEY_ALLOW_ADDING_APNS_BOOL = "allow_adding_apns_bool";		field public static final java.lang.String KEY_ALLOW_ADDING_APNS_BOOL = "allow_adding_apns_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_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL = "allow_emergency_numbers_in_call_log_bool";
			field public static final java.lang.String KEY_ALLOW_EMERGENCY_VIDEO_CALLS_BOOL = "allow_emergency_video_calls_bool";
	field public static final java.lang.String KEY_ALLOW_LOCAL_DTMF_TONES_BOOL = "allow_local_dtmf_tones_bool";		field public static final java.lang.String KEY_ALLOW_LOCAL_DTMF_TONES_BOOL = "allow_local_dtmf_tones_bool";
	field public static final java.lang.String KEY_ALLOW_NON_EMERGENCY_CALLS_IN_ECM_BOOL = "allow_non_emergency_calls_in_ecm_bool";		field public static final java.lang.String KEY_ALLOW_NON_EMERGENCY_CALLS_IN_ECM_BOOL = "allow_non_emergency_calls_in_ecm_bool";
	field public static final java.lang.String KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOL = "always_show_emergency_alert_onoff_bool";		field public static final java.lang.String KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOL = "always_show_emergency_alert_onoff_bool";

telephony/java/android/telephony/CarrierConfigManager.java

+3 −18

Original line number	Original line	Diff line number	Diff line
	@@ -590,21 +590,8 @@ public class CarrierConfigManager {
	* When {@code true}, video calls to emergency numbers will be allowed. When {@code false},		* 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.		* video calls to emergency numbers will be initiated as audio-only calls instead.
	*/		*/
	@SystemApi		public static final String KEY_ALLOW_EMERGENCY_VIDEO_CALLS_BOOL =
	public static final String BOOL_ALLOW_EMERGENCY_VIDEO_CALLS =		"allow_emergency_video_calls_bool";
	"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.
	*/
	@SystemApi
	public static final String BOOL_ALLOW_VIDEO_PAUSE =
	"bool_allow_video_pause";


	/**		/**
	* Flag indicating whether the carrier supports RCS presence indication for video calls. When		* Flag indicating whether the carrier supports RCS presence indication for video calls. When
	@@ -617,7 +604,6 @@ public class CarrierConfigManager {
	* and can choose to hide or show the video calling icon based on whether a contact supports		* and can choose to hide or show the video calling icon based on whether a contact supports
	* video.		* video.
	*/		*/
	@SystemApi
	public static final String KEY_USE_RCS_PRESENCE_BOOL = "use_rcs_presence_bool";		public static final String KEY_USE_RCS_PRESENCE_BOOL = "use_rcs_presence_bool";

	/**		/**
	@@ -715,8 +701,7 @@ public class CarrierConfigManager {
	sDefaults.putBoolean(KEY_EDITABLE_ENHANCED_4G_LTE_BOOL, true);		sDefaults.putBoolean(KEY_EDITABLE_ENHANCED_4G_LTE_BOOL, true);
	sDefaults.putBoolean(KEY_HIDE_IMS_APN_BOOL, false);		sDefaults.putBoolean(KEY_HIDE_IMS_APN_BOOL, false);
	sDefaults.putBoolean(KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL, false);		sDefaults.putBoolean(KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL, false);
	sDefaults.putBoolean(BOOL_ALLOW_EMERGENCY_VIDEO_CALLS, false);		sDefaults.putBoolean(KEY_ALLOW_EMERGENCY_VIDEO_CALLS_BOOL, false);
	sDefaults.putBoolean(BOOL_ALLOW_VIDEO_PAUSE, true);
	sDefaults.putBoolean(KEY_EDITABLE_WFC_MODE_BOOL, true);		sDefaults.putBoolean(KEY_EDITABLE_WFC_MODE_BOOL, true);

	// MMS defaults		// MMS defaults