Merge "Replace createSmsSubmitPdu with createFromNativeSmsSubmitPdu" (ab2c1e57) · Commits · e / os / android_frameworks_base

core/api/current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -40663,7 +40663,6 @@ package android.telephony {
		method public static int[] calculateLength(String, boolean);
		method @Deprecated public static android.telephony.SmsMessage createFromPdu(byte[]);
		method public static android.telephony.SmsMessage createFromPdu(byte[], String);
		method @Nullable public static android.telephony.SmsMessage createSmsSubmitPdu(@NonNull byte[], boolean);
		method public String getDisplayMessageBody();
		method public String getDisplayOriginatingAddress();
		method public String getEmailBody();

+4 −18

Original line number	Diff line number	Diff line
		@@ -300,9 +300,12 @@ public class SmsMessage {
		* @param data Message data.
		* @param isCdma Indicates weather the type of the SMS is CDMA.
		* @return An SmsMessage representing the message.
		*
		* @hide
		*/
		@SystemApi
		@Nullable
		public static SmsMessage createSmsSubmitPdu(@NonNull byte[] data, boolean isCdma) {
		public static SmsMessage createFromNativeSmsSubmitPdu(@NonNull byte[] data, boolean isCdma) {
		SmsMessageBase wrappedMessage;

		if (isCdma) {
		@@ -317,23 +320,6 @@ public class SmsMessage {
		return wrappedMessage != null ? new SmsMessage(wrappedMessage) : null;
		}

		/**
		* Create an SmsMessage from a native SMS-Submit PDU, specified by Bluetooth Message Access
		* Profile Specification v1.4.2 5.8.
		* This is used by Bluetooth MAP profile to decode message when sending non UTF-8 SMS messages.
		*
		* @param data Message data.
		* @param isCdma Indicates weather the type of the SMS is CDMA.
		* @return An SmsMessage representing the message.
		*
		* @hide
		*/
		@SystemApi
		@Nullable
		public static SmsMessage createFromNativeSmsSubmitPdu(@NonNull byte[] data, boolean isCdma) {
		return null;
		}

		/**
		* Get the TP-Layer-Length for the given SMS-SUBMIT PDU Basically, the
		* length in bytes (not hex chars) less the SMSC header