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

Commit 6d46ef07 authored Jan 06, 2021 by Shuo Qian Committed by Automerger Merge Worker Jan 06, 2021

Merge "Add Call Composer Carrier Config keys" am: 4260bc4f am: a1106b08

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535178

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id284c446b1a39a3a208ab99037554081f70a8c9e

parents f35776e6 a1106b08

core/api/current.txt

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -39364,6 +39364,7 @@ package android.telephony {
	field public static final String KEY_CALL_BARRING_SUPPORTS_DEACTIVATE_ALL_BOOL = "call_barring_supports_deactivate_all_bool";		field public static final String KEY_CALL_BARRING_SUPPORTS_DEACTIVATE_ALL_BOOL = "call_barring_supports_deactivate_all_bool";
	field public static final String KEY_CALL_BARRING_SUPPORTS_PASSWORD_CHANGE_BOOL = "call_barring_supports_password_change_bool";		field public static final String KEY_CALL_BARRING_SUPPORTS_PASSWORD_CHANGE_BOOL = "call_barring_supports_password_change_bool";
	field public static final String KEY_CALL_BARRING_VISIBILITY_BOOL = "call_barring_visibility_bool";		field public static final String KEY_CALL_BARRING_VISIBILITY_BOOL = "call_barring_visibility_bool";
			field public static final String KEY_CALL_COMPOSER_PICTURE_SERVER_URL_STRING = "call_composer_picture_server_url_string";
	field public static final String KEY_CALL_FORWARDING_BLOCKS_WHILE_ROAMING_STRING_ARRAY = "call_forwarding_blocks_while_roaming_string_array";		field public static final String KEY_CALL_FORWARDING_BLOCKS_WHILE_ROAMING_STRING_ARRAY = "call_forwarding_blocks_while_roaming_string_array";
	field public static final String KEY_CALL_REDIRECTION_SERVICE_COMPONENT_NAME_STRING = "call_redirection_service_component_name_string";		field public static final String KEY_CALL_REDIRECTION_SERVICE_COMPONENT_NAME_STRING = "call_redirection_service_component_name_string";
	field public static final String KEY_CARRIER_ALLOW_DEFLECT_IMS_CALL_BOOL = "carrier_allow_deflect_ims_call_bool";		field public static final String KEY_CARRIER_ALLOW_DEFLECT_IMS_CALL_BOOL = "carrier_allow_deflect_ims_call_bool";
	@@ -39553,6 +39554,7 @@ package android.telephony {
	field public static final String KEY_SIMPLIFIED_NETWORK_SETTINGS_BOOL = "simplified_network_settings_bool";		field public static final String KEY_SIMPLIFIED_NETWORK_SETTINGS_BOOL = "simplified_network_settings_bool";
	field public static final String KEY_SIM_NETWORK_UNLOCK_ALLOW_DISMISS_BOOL = "sim_network_unlock_allow_dismiss_bool";		field public static final String KEY_SIM_NETWORK_UNLOCK_ALLOW_DISMISS_BOOL = "sim_network_unlock_allow_dismiss_bool";
	field public static final String KEY_SMS_REQUIRES_DESTINATION_NUMBER_CONVERSION_BOOL = "sms_requires_destination_number_conversion_bool";		field public static final String KEY_SMS_REQUIRES_DESTINATION_NUMBER_CONVERSION_BOOL = "sms_requires_destination_number_conversion_bool";
			field public static final String KEY_SUPPORTS_CALL_COMPOSER_BOOL = "supports_call_composer_bool";
	field public static final String KEY_SUPPORT_3GPP_CALL_FORWARDING_WHILE_ROAMING_BOOL = "support_3gpp_call_forwarding_while_roaming_bool";		field public static final String KEY_SUPPORT_3GPP_CALL_FORWARDING_WHILE_ROAMING_BOOL = "support_3gpp_call_forwarding_while_roaming_bool";
	field public static final String KEY_SUPPORT_ADD_CONFERENCE_PARTICIPANTS_BOOL = "support_add_conference_participants_bool";		field public static final String KEY_SUPPORT_ADD_CONFERENCE_PARTICIPANTS_BOOL = "support_add_conference_participants_bool";
	field public static final String KEY_SUPPORT_ADHOC_CONFERENCE_CALLS_BOOL = "support_adhoc_conference_calls_bool";		field public static final String KEY_SUPPORT_ADHOC_CONFERENCE_CALLS_BOOL = "support_adhoc_conference_calls_bool";

telephony/java/android/telephony/CarrierConfigManager.java

+13 −0

Original line number	Original line	Diff line number	Diff line
	@@ -4055,6 +4055,17 @@ public class CarrierConfigManager {
	public static final String KEY_DEFAULT_PREFERRED_APN_NAME_STRING =		public static final String KEY_DEFAULT_PREFERRED_APN_NAME_STRING =
	"default_preferred_apn_name_string";		"default_preferred_apn_name_string";

			/**
			* Indicates if the carrier supports call composer.
			*/
			public static final String KEY_SUPPORTS_CALL_COMPOSER_BOOL = "supports_call_composer_bool";

			/**
			* Indicates the carrier server url that serves the call composer picture.
			*/
			public static final String KEY_CALL_COMPOSER_PICTURE_SERVER_URL_STRING =
			"call_composer_picture_server_url_string";

	/**		/**
	* For Android 11, provide a temporary solution for OEMs to use the lower of the two MTU values		* For Android 11, provide a temporary solution for OEMs to use the lower of the two MTU values
	* for IPv4 and IPv6 if both are sent.		* for IPv4 and IPv6 if both are sent.
	@@ -4613,6 +4624,8 @@ public class CarrierConfigManager {
	sDefaults.putStringArray(KEY_MISSED_INCOMING_CALL_SMS_PATTERN_STRING_ARRAY, new String[0]);		sDefaults.putStringArray(KEY_MISSED_INCOMING_CALL_SMS_PATTERN_STRING_ARRAY, new String[0]);
	sDefaults.putBoolean(KEY_DISABLE_DUN_APN_WHILE_ROAMING_WITH_PRESET_APN_BOOL, false);		sDefaults.putBoolean(KEY_DISABLE_DUN_APN_WHILE_ROAMING_WITH_PRESET_APN_BOOL, false);
	sDefaults.putString(KEY_DEFAULT_PREFERRED_APN_NAME_STRING, "");		sDefaults.putString(KEY_DEFAULT_PREFERRED_APN_NAME_STRING, "");
			sDefaults.putBoolean(KEY_SUPPORTS_CALL_COMPOSER_BOOL, false);
			sDefaults.putString(KEY_CALL_COMPOSER_PICTURE_SERVER_URL_STRING, "");
	sDefaults.putBoolean(KEY_USE_LOWER_MTU_VALUE_IF_BOTH_RECEIVED, false);		sDefaults.putBoolean(KEY_USE_LOWER_MTU_VALUE_IF_BOTH_RECEIVED, false);
	sDefaults.putBoolean(KEY_USE_ACS_FOR_RCS_BOOL, false);		sDefaults.putBoolean(KEY_USE_ACS_FOR_RCS_BOOL, false);
	}		}