Merge "Add Provisioning bundle for indicating if MMTEL/RCS provisionig is required" (05c4d595) · Commits · e / os / android_frameworks_base

core/api/current.txt

+12 −3

Original line number	Diff line number	Diff line
		@@ -41817,11 +41817,11 @@ package android.telephony {
		field public static final String KEY_CARRIER_SUPPORTS_SS_OVER_UT_BOOL = "carrier_supports_ss_over_ut_bool";
		field public static final String KEY_CARRIER_USE_IMS_FIRST_FOR_EMERGENCY_BOOL = "carrier_use_ims_first_for_emergency_bool";
		field public static final String KEY_CARRIER_USSD_METHOD_INT = "carrier_ussd_method_int";
		field public static final String KEY_CARRIER_UT_PROVISIONING_REQUIRED_BOOL = "carrier_ut_provisioning_required_bool";
		field @Deprecated public static final String KEY_CARRIER_UT_PROVISIONING_REQUIRED_BOOL = "carrier_ut_provisioning_required_bool";
		field public static final String KEY_CARRIER_VOLTE_AVAILABLE_BOOL = "carrier_volte_available_bool";
		field public static final String KEY_CARRIER_VOLTE_OVERRIDE_WFC_PROVISIONING_BOOL = "carrier_volte_override_wfc_provisioning_bool";
		field public static final String KEY_CARRIER_VOLTE_PROVISIONED_BOOL = "carrier_volte_provisioned_bool";
		field public static final String KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOL = "carrier_volte_provisioning_required_bool";
		field @Deprecated public static final String KEY_CARRIER_VOLTE_PROVISIONED_BOOL = "carrier_volte_provisioned_bool";
		field @Deprecated public static final String KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOL = "carrier_volte_provisioning_required_bool";
		field public static final String KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL = "carrier_volte_tty_supported_bool";
		field public static final String KEY_CARRIER_VT_AVAILABLE_BOOL = "carrier_vt_available_bool";
		field @Deprecated public static final String KEY_CARRIER_VVM_PACKAGE_NAME_STRING = "carrier_vvm_package_name_string";
		@@ -42067,6 +42067,13 @@ package android.telephony {
		field public static final int IPSEC_ENCRYPTION_ALGORITHM_AES_CBC = 2; // 0x2
		field public static final int IPSEC_ENCRYPTION_ALGORITHM_DES_EDE3_CBC = 1; // 0x1
		field public static final int IPSEC_ENCRYPTION_ALGORITHM_NULL = 0; // 0x0
		field public static final String KEY_CAPABILITY_CALL_COMPOSER_INT_ARRAY = "ims.key_capability_type_call_composer_int_array";
		field public static final String KEY_CAPABILITY_TYPE_OPTIONS_UCE_INT_ARRAY = "ims.key_capability_type_options_uce_int_array";
		field public static final String KEY_CAPABILITY_TYPE_PRESENCE_UCE_INT_ARRAY = "ims.key_capability_type_presence_uce_int_array";
		field public static final String KEY_CAPABILITY_TYPE_SMS_INT_ARRAY = "ims.key_capability_type_sms_int_array";
		field public static final String KEY_CAPABILITY_TYPE_UT_INT_ARRAY = "ims.key_capability_type_ut_int_array";
		field public static final String KEY_CAPABILITY_TYPE_VIDEO_INT_ARRAY = "ims.key_capability_type_video_int_array";
		field public static final String KEY_CAPABILITY_TYPE_VOICE_INT_ARRAY = "ims.key_capability_type_voice_int_array";
		field public static final String KEY_ENABLE_PRESENCE_CAPABILITY_EXCHANGE_BOOL = "ims.enable_presence_capability_exchange_bool";
		field public static final String KEY_ENABLE_PRESENCE_GROUP_SUBSCRIBE_BOOL = "ims.enable_presence_group_subscribe_bool";
		field public static final String KEY_ENABLE_PRESENCE_PUBLISH_BOOL = "ims.enable_presence_publish_bool";
		@@ -42081,11 +42088,13 @@ package android.telephony {
		field public static final String KEY_IPV4_SIP_MTU_SIZE_CELLULAR_INT = "ims.ipv4_sip_mtu_size_cellular_int";
		field public static final String KEY_IPV6_SIP_MTU_SIZE_CELLULAR_INT = "ims.ipv6_sip_mtu_size_cellular_int";
		field public static final String KEY_KEEP_PDN_UP_IN_NO_VOPS_BOOL = "ims.keep_pdn_up_in_no_vops_bool";
		field public static final String KEY_MMTEL_REQUIRES_PROVISIONING_BUNDLE = "ims.mmtel_requires_provisioning_bundle";
		field public static final String KEY_NON_RCS_CAPABILITIES_CACHE_EXPIRATION_SEC_INT = "ims.non_rcs_capabilities_cache_expiration_sec_int";
		field public static final String KEY_PHONE_CONTEXT_DOMAIN_NAME_STRING = "ims.phone_context_domain_name_string";
		field public static final String KEY_PREFIX = "ims.";
		field public static final String KEY_RCS_BULK_CAPABILITY_EXCHANGE_BOOL = "ims.rcs_bulk_capability_exchange_bool";
		field public static final String KEY_RCS_FEATURE_TAG_ALLOWED_STRING_ARRAY = "ims.rcs_feature_tag_allowed_string_array";
		field public static final String KEY_RCS_REQUIRES_PROVISIONING_BUNDLE = "ims.rcs_requires_provisioning_bundle";
		field public static final String KEY_REGISTRATION_EVENT_PACKAGE_SUPPORTED_BOOL = "ims.registration_event_package_supported_bool";
		field public static final String KEY_REGISTRATION_EXPIRY_TIMER_SEC_INT = "ims.registration_expiry_timer_sec_int";
		field public static final String KEY_REGISTRATION_RETRY_BASE_TIMER_MILLIS_INT = "ims.registration_retry_base_timer_millis_int";

telephony/java/android/telephony/CarrierConfigManager.java

+103 −20

Original line number	Diff line number	Diff line
		@@ -175,7 +175,10 @@ public class CarrierConfigManager {
		/**
		* This flag specifies whether VoLTE availability is based on provisioning. By default this is
		* false.
		* Used for UCE to determine if EAB provisioning checks should be based on provisioning.
		* @deprecated Use {@link Ims#KEY_MMTEL_REQUIRES_PROVISIONING_BUNDLE} instead.
		*/
		@Deprecated
		public static final String
		KEY_CARRIER_VOLTE_PROVISIONED_BOOL = "carrier_volte_provisioned_bool";

		@@ -879,7 +882,12 @@ public class CarrierConfigManager {
		/**
		* Flag specifying whether provisioning is required for VoLTE, Video Telephony, and WiFi
		* Calling.

		* Combines VoLTE, VT, VoWiFI calling provisioning into one parameter.
		* @deprecated Use {@link Ims#KEY_MMTEL_REQUIRES_PROVISIONING_BUNDLE} instead for
		* finer-grained control.
		*/
		@Deprecated
		public static final String KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOL
		= "carrier_volte_provisioning_required_bool";

		@@ -893,7 +901,11 @@ public class CarrierConfigManager {
		* and enable the UT over IMS capability for the subscription when the subscription is loaded.
		*
		* The default value for this key is {@code false}.
		*
		* @deprecated Use {@link Ims#KEY_MMTEL_REQUIRES_PROVISIONING_BUNDLE} instead for
		* determining if UT requires provisioning.
		*/
		@Deprecated
		public static final String KEY_CARRIER_UT_PROVISIONING_REQUIRED_BOOL =
		"carrier_ut_provisioning_required_bool";

		@@ -5174,34 +5186,93 @@ public class CarrierConfigManager {
		public static final int E911_RTP_INACTIVITY_ON_CONNECTED = 4;

		/**
		* An array of strings, each entry contains a MMTEL capability and registration
		* technology tuple that requires provisioning. If a tuple is not present, the
		* A bundle which specifies the MMTEL capability and registration technology
		* that requires provisioning. If a tuple is not present, the
		* framework will not require that the tuple requires provisioning before
		* enabling the capability.
		* <p>
		* Format for each tuple is two integers separated by a comma. The first
		* integer is an integer defined in
		* {@link MmTelFeature.MmTelCapabilities.MmTelCapability} and the second integer is
		* <p> Possible keys in this bundle are
		* <ul>
		* <li>{@link #KEY_CAPABILITY_TYPE_VOICE_INT_ARRAY}</li>
		* <li>{@link #KEY_CAPABILITY_TYPE_VIDEO_INT_ARRAY}</li>
		* <li>{@link #KEY_CAPABILITY_TYPE_UT_INT_ARRAY}</li>
		* <li>{@link #KEY_CAPABILITY_TYPE_SMS_INT_ARRAY}</li>
		* <li>{@link #KEY_CAPABILITY_CALL_COMPOSER_INT_ARRAY}</li>
		* </ul>
		* <p> The values are defined in
		* {@link android.telephony.ims.stub.ImsRegistrationImplBase.ImsRegistrationTech}
		* @hide
		*/
		public static final String KEY_MMTEL_REQUIRES_PROVISIONING_STRING_ARRAY =
		KEY_PREFIX + "mmtel_requires_provisioning_string_array";
		public static final String KEY_MMTEL_REQUIRES_PROVISIONING_BUNDLE =
		KEY_PREFIX + "mmtel_requires_provisioning_bundle";

		/**
		* This MmTelFeature supports Voice calling (IR.92)
		* @see MmTelFeature.MmTelCapabilities#CAPABILITY_TYPE_VOICE
		*/
		public static final String KEY_CAPABILITY_TYPE_VOICE_INT_ARRAY =
		KEY_PREFIX + "key_capability_type_voice_int_array";

		/**
		* This MmTelFeature supports Video (IR.94)
		* @see MmTelFeature.MmTelCapabilities#CAPABILITY_TYPE_VIDEO
		*/
		public static final String KEY_CAPABILITY_TYPE_VIDEO_INT_ARRAY =
		KEY_PREFIX + "key_capability_type_video_int_array";

		/**
		* This MmTelFeature supports XCAP over Ut for supplementary services. (IR.92)
		* @see MmTelFeature.MmTelCapabilities#CAPABILITY_TYPE_UT
		*/
		public static final String KEY_CAPABILITY_TYPE_UT_INT_ARRAY =
		KEY_PREFIX + "key_capability_type_ut_int_array";

		/**
		* This MmTelFeature supports SMS (IR.92)
		* @see MmTelFeature.MmTelCapabilities#CAPABILITY_TYPE_SMS
		*/
		public static final String KEY_CAPABILITY_TYPE_SMS_INT_ARRAY =
		KEY_PREFIX + "key_capability_type_sms_int_array";

		/**
		* An array of strings, each entry contains a RCS capability and registration
		* technology tuple that requires provisioning. If a tuple is not present, the
		* This MmTelFeature supports Call Composer (section 2.4 of RCC.20)
		* @see MmTelFeature.MmTelCapabilities#CAPABILITY_TYPE_CALL_COMPOSER
		*/
		public static final String KEY_CAPABILITY_CALL_COMPOSER_INT_ARRAY =
		KEY_PREFIX + "key_capability_type_call_composer_int_array";

		/**
		* A bundle which specifies the RCS capability and registration technology
		* that requires provisioning. If a tuple is not present, the
		* framework will not require that the tuple requires provisioning before
		* enabling the capability.
		* <p>
		* Format for each tuple is two integers separated by a comma. The first
		* integer is an integer defined in
		* {@link RcsFeature.RcsImsCapabilities.RcsImsCapabilityFlag} and the second integer is
		* <p> Possible keys in this bundle are
		* <ul>
		* <li>{@link #KEY_CAPABILITY_TYPE_OPTIONS_UCE_INT_ARRAY}</li>
		* <li>{@link #KEY_CAPABILITY_TYPE_PRESENCE_UCE_INT_ARRAY}</li>
		* </ul>
		* <p> The values are defined in
		* {@link android.telephony.ims.stub.ImsRegistrationImplBase.ImsRegistrationTech}
		* @hide
		*/
		public static final String KEY_RCS_REQUIRES_PROVISIONING_STRING_ARRAY =
		KEY_PREFIX + "rcs_requires_provisioning_string_array";
		public static final String KEY_RCS_REQUIRES_PROVISIONING_BUNDLE =
		KEY_PREFIX + "rcs_requires_provisioning_bundle";

		/**
		* This carrier supports User Capability Exchange using SIP OPTIONS as defined by the
		* framework. If set, the RcsFeature should support capability exchange using SIP OPTIONS.
		* If not set, this RcsFeature should not service capability requests.
		* @see RcsFeature.RcsImsCapabilities#CAPABILITY_TYPE_OPTIONS_UCE
		*/
		public static final String KEY_CAPABILITY_TYPE_OPTIONS_UCE_INT_ARRAY =
		KEY_PREFIX + "key_capability_type_options_uce_int_array";

		/**
		* This carrier supports User Capability Exchange using a presence server as defined by the
		* framework. If set, the RcsFeature should support capability exchange using a presence
		* server. If not set, this RcsFeature should not publish capabilities or service capability
		* requests using presence.
		* @see RcsFeature.RcsImsCapabilities#CAPABILITY_TYPE_PRESENCE_UCE
		*/
		public static final String KEY_CAPABILITY_TYPE_PRESENCE_UCE_INT_ARRAY =
		KEY_PREFIX + "key_capability_type_presence_uce_int_array";

		private Ims() {}

		@@ -5238,8 +5309,20 @@ public class CarrierConfigManager {
		"+g.3gpp.iari-ref=\"urn%3Aurn-7%3A3gpp-application.ims.iari.rcs.chatbot.sa\"",
		"+g.gsma.rcs.botversion=\"#=1,#=2\"",
		"+g.gsma.rcs.cpimext"});
		defaults.putStringArray(KEY_MMTEL_REQUIRES_PROVISIONING_STRING_ARRAY, new String[] {});
		defaults.putStringArray(KEY_RCS_REQUIRES_PROVISIONING_STRING_ARRAY, new String[] {});

		/**
		* @see #KEY_MMTEL_REQUIRES_PROVISIONING_BUNDLE
		*/
		PersistableBundle mmtel_requires_provisioning_int_array = new PersistableBundle();
		defaults.putPersistableBundle(
		KEY_MMTEL_REQUIRES_PROVISIONING_BUNDLE, mmtel_requires_provisioning_int_array);

		/**
		* @see #KEY_RCS_REQUIRES_PROVISIONING_BUNDLE
		*/
		PersistableBundle rcs_requires_provisioning_int_array = new PersistableBundle();
		defaults.putPersistableBundle(
		KEY_RCS_REQUIRES_PROVISIONING_BUNDLE, rcs_requires_provisioning_int_array);

		defaults.putBoolean(KEY_GRUU_ENABLED_BOOL, true);
		defaults.putBoolean(KEY_SIP_OVER_IPSEC_ENABLED_BOOL, true);

telephony/java/android/telephony/ims/ProvisioningManager.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -1451,8 +1451,7 @@ public class ProvisioningManager {
		* <li>{@link TelephonyManager#hasCarrierPrivileges}).</li>
		* </ul>
		*
		* @see CarrierConfigManager#KEY_CARRIER_UT_PROVISIONING_REQUIRED_BOOL
		* @see CarrierConfigManager#KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOL
		* @see CarrierConfigManager.Ims#KEY_MMTEL_REQUIRES_PROVISIONING_BUNDLE
		* @param isProvisioned true if the device is provisioned for UT over IMS, false otherwise.
		*/
		@WorkerThread
		@@ -1485,8 +1484,7 @@ public class ProvisioningManager {
		* {@link TelephonyManager#hasCarrierPrivileges()}).</li>
		* </ul>
		*
		* @see CarrierConfigManager#KEY_CARRIER_UT_PROVISIONING_REQUIRED_BOOL
		* @see CarrierConfigManager#KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOL
		* @see CarrierConfigManager.Ims#KEY_MMTEL_REQUIRES_PROVISIONING_BUNDLE
		* @return true if the device is provisioned for the capability or does not require
		* provisioning, false if the capability does require provisioning and has not been
		* provisioned yet.
		@@ -1547,6 +1545,7 @@ public class ProvisioningManager {
		* {@link TelephonyManager#hasCarrierPrivileges()}).</li>
		* </ul>
		*
		* @see CarrierConfigManager.Ims#KEY_RCS_REQUIRES_PROVISIONING_BUNDLE
		* @return true if the device is provisioned for the capability or does not require
		* provisioning, false if the capability does require provisioning and has not been
		* provisioned yet.
		@@ -1616,6 +1615,7 @@ public class ProvisioningManager {
		* {@link TelephonyManager#hasCarrierPrivileges()}).</li>
		* </ul>
		*
		* @see CarrierConfigManager.Ims#KEY_RCS_REQUIRES_PROVISIONING_BUNDLE
		* @param isProvisioned true if the device is provisioned for the RCS capability specified,
		* false otherwise.
		*/