Merge "Create new Carrier configuration for separate MMTEL/RCS features" (8283939c) · Commits · e / os / android_frameworks_base

api/current.txt

+3 −1

Original line number	Diff line number	Diff line
		@@ -44199,7 +44199,9 @@ package android.telephony {
		field public static final String KEY_CI_ACTION_ON_SYS_UPDATE_EXTRA_STRING = "ci_action_on_sys_update_extra_string";
		field public static final String KEY_CI_ACTION_ON_SYS_UPDATE_EXTRA_VAL_STRING = "ci_action_on_sys_update_extra_val_string";
		field public static final String KEY_CI_ACTION_ON_SYS_UPDATE_INTENT_STRING = "ci_action_on_sys_update_intent_string";
		field public static final String KEY_CONFIG_IMS_PACKAGE_OVERRIDE_STRING = "config_ims_package_override_string";
		field public static final String KEY_CONFIG_IMS_MMTEL_PACKAGE_OVERRIDE_STRING = "config_ims_mmtel_package_override_string";
		field @Deprecated public static final String KEY_CONFIG_IMS_PACKAGE_OVERRIDE_STRING = "config_ims_package_override_string";
		field public static final String KEY_CONFIG_IMS_RCS_PACKAGE_OVERRIDE_STRING = "config_ims_rcs_package_override_string";
		field public static final String KEY_CONFIG_PLANS_PACKAGE_OVERRIDE_STRING = "config_plans_package_override_string";
		field public static final String KEY_CONFIG_TELEPHONY_USE_OWN_NUMBER_FOR_VOICEMAIL_BOOL = "config_telephony_use_own_number_for_voicemail_bool";
		field public static final String KEY_CSP_ENABLED_BOOL = "csp_enabled_bool";

core/res/res/values/config.xml

+0 −4

Original line number	Diff line number	Diff line
		@@ -3020,10 +3020,6 @@
		<!-- Whether to use voip audio mode for ims call -->
		<bool name="config_use_voip_mode_for_ims">false</bool>

		<!-- ImsService package name to bind to by default. If none is specified in an overlay, an
		empty string is passed in -->
		<string name="config_ims_package"/>

		<!-- String array containing numbers that shouldn't be logged. Country-specific. -->
		<string-array name="unloggable_phone_numbers" />

core/res/res/values/symbols.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -295,7 +295,6 @@
		<java-symbol type="bool" name="config_enableBurnInProtection" />
		<java-symbol type="bool" name="config_hotswapCapable" />
		<java-symbol type="bool" name="config_mms_content_disposition_support" />
		<java-symbol type="string" name="config_ims_package" />
		<java-symbol type="string" name="config_wwan_network_service_package" />
		<java-symbol type="string" name="config_wlan_network_service_package" />
		<java-symbol type="string" name="config_wwan_network_service_class" />

telephony/java/android/telephony/CarrierConfigManager.java

+24 −1

Original line number	Diff line number	Diff line
		@@ -419,11 +419,32 @@ public class CarrierConfigManager {
		KEY_GSM_NONROAMING_NETWORKS_STRING_ARRAY = "gsm_nonroaming_networks_string_array";

		/**
		* Override the device's configuration for the ImsService to use for this SIM card.
		* The package name containing the ImsService that will be bound to the telephony framework to
		* support both IMS MMTEL and RCS feature functionality instead of the device default
		* ImsService for this subscription.
		* @deprecated Use {@link #KEY_CONFIG_IMS_MMTEL_PACKAGE_OVERRIDE_STRING} and
		* {@link #KEY_CONFIG_IMS_RCS_PACKAGE_OVERRIDE_STRING} instead to configure these values
		* separately. If any of those values are not empty, they will override this value.
		*/
		public static final String KEY_CONFIG_IMS_PACKAGE_OVERRIDE_STRING =
		"config_ims_package_override_string";

		/**
		* The package name containing the ImsService that will be bound to the telephony framework to
		* support IMS MMTEL feature functionality instead of the device default ImsService for this
		* subscription.
		*/
		public static final String KEY_CONFIG_IMS_MMTEL_PACKAGE_OVERRIDE_STRING =
		"config_ims_mmtel_package_override_string";

		/**
		* The package name containing the ImsService that will be bound to the telephony framework to
		* support IMS RCS feature functionality instead of the device default ImsService for this
		* subscription.
		*/
		public static final String KEY_CONFIG_IMS_RCS_PACKAGE_OVERRIDE_STRING =
		"config_ims_rcs_package_override_string";

		/**
		* Override the package that will manage {@link SubscriptionPlan}
		* information instead of the {@link CarrierService} that defines this
		@@ -3503,6 +3524,8 @@ public class CarrierConfigManager {
		sDefaults.putStringArray(KEY_GSM_ROAMING_NETWORKS_STRING_ARRAY, null);
		sDefaults.putStringArray(KEY_GSM_NONROAMING_NETWORKS_STRING_ARRAY, null);
		sDefaults.putString(KEY_CONFIG_IMS_PACKAGE_OVERRIDE_STRING, null);
		sDefaults.putString(KEY_CONFIG_IMS_MMTEL_PACKAGE_OVERRIDE_STRING, null);
		sDefaults.putString(KEY_CONFIG_IMS_RCS_PACKAGE_OVERRIDE_STRING, null);
		sDefaults.putStringArray(KEY_CDMA_ROAMING_NETWORKS_STRING_ARRAY, null);
		sDefaults.putStringArray(KEY_CDMA_NONROAMING_NETWORKS_STRING_ARRAY, null);
		sDefaults.putStringArray(KEY_DIAL_STRING_REPLACE_STRING_ARRAY, null);

telephony/java/com/android/internal/telephony/ITelephony.aidl

+3 −2

Original line number	Diff line number	Diff line
		@@ -858,12 +858,13 @@ interface ITelephony {
		/**
		* @return true if the ImsService to bind to for the slot id specified was set, false otherwise.
		*/
		boolean setImsService(int slotId, boolean isCarrierImsService, String packageName);
		boolean setBoundImsServiceOverride(int slotIndex, boolean isCarrierService,
		in int[] featureTypes, in String packageName);

		/**
		* @return the package name of the carrier/device ImsService associated with this slot.
		*/
		String getImsService(int slotId, boolean isCarrierImsService);
		String getBoundImsServicePackage(int slotIndex, boolean isCarrierImsService, int featureType);

		/**
		* Get the MmTelFeature state attached to this subscription id.