Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 967a468a authored Mar 03, 2020 by Treehugger Robot Committed by Gerrit Code Review Mar 03, 2020

Merge "Change createFromNativeSmsSubmitPdu for API review"

parents a027373f 5b0e5bbf

api/current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -45670,6 +45670,7 @@ 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();

api/system-current.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -9236,7 +9236,6 @@ package android.telephony {
		}

		public class SmsMessage {
		method @Nullable public static android.telephony.SmsMessage createFromNativeSmsSubmitPdu(@NonNull byte[], boolean);
		method @Nullable public static android.telephony.SmsMessage.SubmitPdu getSmsPdu(int, int, @Nullable String, @NonNull String, @NonNull String, long);
		method @NonNull @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public static byte[] getSubmitPduEncodedMessage(boolean, @NonNull String, @NonNull String, int, int, int, int, int, int);
		}

telephony/java/android/telephony/SmsMessage.java

+1 −4

Original line number	Diff line number	Diff line
		@@ -320,12 +320,9 @@ 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 createFromNativeSmsSubmitPdu(@NonNull byte[] data, boolean isCdma) {
		public static SmsMessage createSmsSubmitPdu(@NonNull byte[] data, boolean isCdma) {
		SmsMessageBase wrappedMessage;

		if (isCdma) {

telephony/java/com/android/internal/telephony/cdma/SmsMessage.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package com.android.internal.telephony.cdma;

		import android.compat.annotation.UnsupportedAppUsage;
		import android.content.res.Resources;
		import android.os.Build;
		import android.sysprop.TelephonyProperties;
		import android.telephony.PhoneNumberUtils;
		import android.telephony.SmsCbLocation;
		@@ -156,7 +157,8 @@ public class SmsMessage extends SmsMessageBase {
		*
		* @hide
		*/
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.Q, publicAlternatives = "Use {@link "
		+ "android.telephony.SmsMessage} API instead")
		public static SmsMessage createFromEfRecord(int index, byte[] data) {
		try {
		SmsMessage msg = new SmsMessage();

telephony/java/com/android/internal/telephony/gsm/SmsMessage.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ import static com.android.internal.telephony.SmsConstants.MessageClass;

		import android.compat.annotation.UnsupportedAppUsage;
		import android.content.res.Resources;
		import android.os.Build;
		import android.telephony.PhoneNumberUtils;
		import android.text.TextUtils;

		@@ -179,7 +180,8 @@ public class SmsMessage extends SmsMessageBase {
		*
		* @hide
		*/
		@UnsupportedAppUsage
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.Q, publicAlternatives = "Use {@link "
		+ "android.telephony.SmsMessage} API instead")
		public static SmsMessage createFromEfRecord(int index, byte[] data) {
		try {
		SmsMessage msg = new SmsMessage();