Merge "API Review: Define the extras as containing CharSequences, not Strings"... (bfa43949) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/ImsManager.java

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -74,17 +74,17 @@ public class ImsManager {
	"android.telephony.ims.action.WFC_IMS_REGISTRATION_ERROR";		"android.telephony.ims.action.WFC_IMS_REGISTRATION_ERROR";

	/**		/**
	* An extra key corresponding to a String value which contains the carrier specific title to be		* An extra key corresponding to a {@link CharSequence} value which contains the carrier
	* displayed as part of the message shown to the user when there is an error registering for		* specific title to be displayed as part of the message shown to the user when there is an
	* WiFi calling.		* error registering for WiFi calling.
	*/		*/
	public static final String EXTRA_WFC_REGISTRATION_FAILURE_TITLE =		public static final String EXTRA_WFC_REGISTRATION_FAILURE_TITLE =
	"android.telephony.ims.extra.WFC_REGISTRATION_FAILURE_TITLE";		"android.telephony.ims.extra.WFC_REGISTRATION_FAILURE_TITLE";

	/**		/**
	* An extra key corresponding to a String value which contains the carrier specific message to		* An extra key corresponding to a {@link CharSequence} value which contains the carrier
	* be displayed as part of the message shown to the user when there is an error registering for		* specific message to be displayed as part of the message shown to the user when there is an
	* WiFi calling.		* error registering for WiFi calling.
	*/		*/
	public static final String EXTRA_WFC_REGISTRATION_FAILURE_MESSAGE =		public static final String EXTRA_WFC_REGISTRATION_FAILURE_MESSAGE =
	"android.telephony.ims.extra.WFC_REGISTRATION_FAILURE_MESSAGE";		"android.telephony.ims.extra.WFC_REGISTRATION_FAILURE_MESSAGE";