Expose SmsMessage#FORMAT_ constants as public APIs. (beb90fda) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -40445,6 +40445,8 @@ package android.telephony {
	field public static final int ENCODING_7BIT = 1; // 0x1		field public static final int ENCODING_7BIT = 1; // 0x1
	field public static final int ENCODING_8BIT = 2; // 0x2		field public static final int ENCODING_8BIT = 2; // 0x2
	field public static final int ENCODING_UNKNOWN = 0; // 0x0		field public static final int ENCODING_UNKNOWN = 0; // 0x0
			field public static final java.lang.String FORMAT_3GPP = "3gpp";
			field public static final java.lang.String FORMAT_3GPP2 = "3gpp2";
	field public static final int MAX_USER_DATA_BYTES = 140; // 0x8c		field public static final int MAX_USER_DATA_BYTES = 140; // 0x8c
	field public static final int MAX_USER_DATA_BYTES_WITH_HEADER = 134; // 0x86		field public static final int MAX_USER_DATA_BYTES_WITH_HEADER = 134; // 0x86
	field public static final int MAX_USER_DATA_SEPTETS = 160; // 0xa0		field public static final int MAX_USER_DATA_SEPTETS = 160; // 0xa0

api/system-current.txt

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -43965,6 +43965,8 @@ package android.telephony {
	field public static final int ENCODING_7BIT = 1; // 0x1		field public static final int ENCODING_7BIT = 1; // 0x1
	field public static final int ENCODING_8BIT = 2; // 0x2		field public static final int ENCODING_8BIT = 2; // 0x2
	field public static final int ENCODING_UNKNOWN = 0; // 0x0		field public static final int ENCODING_UNKNOWN = 0; // 0x0
			field public static final java.lang.String FORMAT_3GPP = "3gpp";
			field public static final java.lang.String FORMAT_3GPP2 = "3gpp2";
	field public static final int MAX_USER_DATA_BYTES = 140; // 0x8c		field public static final int MAX_USER_DATA_BYTES = 140; // 0x8c
	field public static final int MAX_USER_DATA_BYTES_WITH_HEADER = 134; // 0x86		field public static final int MAX_USER_DATA_BYTES_WITH_HEADER = 134; // 0x86
	field public static final int MAX_USER_DATA_SEPTETS = 160; // 0xa0		field public static final int MAX_USER_DATA_SEPTETS = 160; // 0xa0

api/test-current.txt

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -40840,6 +40840,8 @@ package android.telephony {
	field public static final int ENCODING_7BIT = 1; // 0x1		field public static final int ENCODING_7BIT = 1; // 0x1
	field public static final int ENCODING_8BIT = 2; // 0x2		field public static final int ENCODING_8BIT = 2; // 0x2
	field public static final int ENCODING_UNKNOWN = 0; // 0x0		field public static final int ENCODING_UNKNOWN = 0; // 0x0
			field public static final java.lang.String FORMAT_3GPP = "3gpp";
			field public static final java.lang.String FORMAT_3GPP2 = "3gpp2";
	field public static final int MAX_USER_DATA_BYTES = 140; // 0x8c		field public static final int MAX_USER_DATA_BYTES = 140; // 0x8c
	field public static final int MAX_USER_DATA_BYTES_WITH_HEADER = 134; // 0x86		field public static final int MAX_USER_DATA_BYTES_WITH_HEADER = 134; // 0x86
	field public static final int MAX_USER_DATA_SEPTETS = 160; // 0xa0		field public static final int MAX_USER_DATA_SEPTETS = 160; // 0xa0

telephony/java/android/telephony/SmsManager.java

+9 −6

telephony/java/android/telephony/SmsMessage.java

+12 −8

Original line number	Original line	Diff line number	Diff line
	@@ -16,24 +16,25 @@

	package android.telephony;		package android.telephony;

	import android.os.Binder;		import static android.telephony.TelephonyManager.PHONE_TYPE_CDMA;
	import android.os.Parcel;
			import android.annotation.StringDef;
	import android.content.res.Resources;		import android.content.res.Resources;
			import android.os.Binder;
	import android.text.TextUtils;		import android.text.TextUtils;

	import com.android.internal.telephony.GsmAlphabet;		import com.android.internal.telephony.GsmAlphabet;
	import com.android.internal.telephony.GsmAlphabet.TextEncodingDetails;		import com.android.internal.telephony.GsmAlphabet.TextEncodingDetails;
			import com.android.internal.telephony.Sms7BitEncodingTranslator;
	import com.android.internal.telephony.SmsConstants;		import com.android.internal.telephony.SmsConstants;
	import com.android.internal.telephony.SmsMessageBase;		import com.android.internal.telephony.SmsMessageBase;
	import com.android.internal.telephony.SmsMessageBase.SubmitPduBase;		import com.android.internal.telephony.SmsMessageBase.SubmitPduBase;
	import com.android.internal.telephony.Sms7BitEncodingTranslator;

	import java.lang.Math;		import java.lang.annotation.Retention;
			import java.lang.annotation.RetentionPolicy;
	import java.util.ArrayList;		import java.util.ArrayList;
	import java.util.Arrays;		import java.util.Arrays;

	import static android.telephony.TelephonyManager.PHONE_TYPE_CDMA;


	/**		/**
	* A Short Message Service message.		* A Short Message Service message.
	@@ -81,15 +82,18 @@ public class SmsMessage {
	*/		*/
	public static final int MAX_USER_DATA_SEPTETS_WITH_HEADER = 153;		public static final int MAX_USER_DATA_SEPTETS_WITH_HEADER = 153;

			/** @hide */
			@StringDef({FORMAT_3GPP, FORMAT_3GPP2})
			@Retention(RetentionPolicy.SOURCE)
			public @interface Format {}

	/**		/**
	* Indicates a 3GPP format SMS message.		* Indicates a 3GPP format SMS message.
	* @hide pending API council approval
	*/		*/
	public static final String FORMAT_3GPP = "3gpp";		public static final String FORMAT_3GPP = "3gpp";

	/**		/**
	* Indicates a 3GPP2 format SMS message.		* Indicates a 3GPP2 format SMS message.
	* @hide pending API council approval
	*/		*/
	public static final String FORMAT_3GPP2 = "3gpp2";		public static final String FORMAT_3GPP2 = "3gpp2";

Original line number	Original line	Diff line number	Diff line
	@@ -390,20 +390,23 @@ public final class SmsManager {
	* Inject an SMS PDU into the android application framework.		* Inject an SMS PDU into the android application framework.
	*		*
	* <p>Requires permission: {@link android.Manifest.permission#MODIFY_PHONE_STATE} or carrier		* <p>Requires permission: {@link android.Manifest.permission#MODIFY_PHONE_STATE} or carrier
	* privileges. @see android.telephony.TelephonyManager#hasCarrierPrivileges		* privileges per {@link android.telephony.TelephonyManager#hasCarrierPrivileges}.
	*		*
	* @param pdu is the byte array of pdu to be injected into android application framework		* @param pdu is the byte array of pdu to be injected into android application framework
	* @param format is the format of SMS pdu (3gpp or 3gpp2)		* @param format is the format of SMS pdu ({@link SmsMessage#FORMAT_3GPP} or
			* {@link SmsMessage#FORMAT_3GPP2})
	* @param receivedIntent if not NULL this <code>PendingIntent</code> is		* @param receivedIntent if not NULL this <code>PendingIntent</code> is
	* broadcast when the message is successfully received by the		* broadcast when the message is successfully received by the
	* android application framework, or failed. This intent is broadcasted at		* android application framework, or failed. This intent is broadcasted at
	* the same time an SMS received from radio is acknowledged back.		* the same time an SMS received from radio is acknowledged back.
	* The result code will be <code>RESULT_SMS_HANDLED</code> for success, or		* The result code will be {@link android.provider.Telephony.Sms.Intents#RESULT_SMS_HANDLED}
	* <code>RESULT_SMS_GENERIC_ERROR</code> for error.		* for success, or {@link android.provider.Telephony.Sms.Intents#RESULT_SMS_GENERIC_ERROR} for
			* error.
	*		*
	* @throws IllegalArgumentException if format is not one of 3gpp and 3gpp2.		* @throws IllegalArgumentException if the format is invalid.
	*/		*/
	public void injectSmsPdu(byte[] pdu, String format, PendingIntent receivedIntent) {		public void injectSmsPdu(
			byte[] pdu, @SmsMessage.Format String format, PendingIntent receivedIntent) {
	if (!format.equals(SmsMessage.FORMAT_3GPP) && !format.equals(SmsMessage.FORMAT_3GPP2)) {		if (!format.equals(SmsMessage.FORMAT_3GPP) && !format.equals(SmsMessage.FORMAT_3GPP2)) {
	// Format must be either 3gpp or 3gpp2.		// Format must be either 3gpp or 3gpp2.
	throw new IllegalArgumentException(		throw new IllegalArgumentException(