From 41f055cf7918550747b4424859f45071c8a87610 Mon Sep 17 00:00:00 2001 From: Zongheng Wang Date: Fri, 21 Feb 2020 11:58:08 -0800 Subject: [PATCH] Change javadoc of getSubmitPduEncodedMessage and add IntRange to its parameters Bug: 149697039 Test: compile Change-Id: I1c6e2d3027dfcea789db779004ed893ac0c37fdd Merged-In: I5e131f71c376db56d3b7aa835058f0d2f4e8566a --- api/system-current.txt | 2 +- telephony/java/android/telephony/SmsMessage.java | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/api/system-current.txt b/api/system-current.txt index 0822fb7da3cfa..aa7baa80b810a 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -9249,7 +9249,7 @@ 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); + method @NonNull @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public static byte[] getSubmitPduEncodedMessage(boolean, @NonNull String, @NonNull String, int, @IntRange(from=0) int, @IntRange(from=0) int, @IntRange(from=0, to=255) int, @IntRange(from=1, to=255) int, @IntRange(from=1, to=255) int); } public class SubscriptionInfo implements android.os.Parcelable { diff --git a/telephony/java/android/telephony/SmsMessage.java b/telephony/java/android/telephony/SmsMessage.java index c68fecffc6dc3..af940cfb21927 100644 --- a/telephony/java/android/telephony/SmsMessage.java +++ b/telephony/java/android/telephony/SmsMessage.java @@ -20,6 +20,7 @@ import static android.telephony.TelephonyManager.PHONE_TYPE_CDMA; import android.Manifest; import android.annotation.IntDef; +import android.annotation.IntRange; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.RequiresPermission; @@ -719,9 +720,9 @@ public class SmsMessage { * 23.040 9.2.3.24.16 * @param languageShiftTable GSM national language shift table to use, specified by 3GPP * 23.040 9.2.3.24.15 - * @param refNumber parameter to create SmsHeader - * @param seqNumber parameter to create SmsHeader - * @param msgCount parameter to create SmsHeader + * @param refNumber reference number of concatenated SMS, specified by 3GPP 23.040 9.2.3.24.1 + * @param seqNumber sequence number of concatenated SMS, specified by 3GPP 23.040 9.2.3.24.1 + * @param msgCount count of messages of concatenated SMS, specified by 3GPP 23.040 9.2.3.24.2 * @return a byte[] containing the encoded message * * @hide @@ -732,9 +733,12 @@ public class SmsMessage { public static byte[] getSubmitPduEncodedMessage(boolean isTypeGsm, @NonNull String destinationAddress, @NonNull String message, - @EncodingSize int encoding, int languageTable, - int languageShiftTable, int refNumber, - int seqNumber, int msgCount) { + @EncodingSize int encoding, + @IntRange(from = 0) int languageTable, + @IntRange(from = 0) int languageShiftTable, + @IntRange(from = 0, to = 255) int refNumber, + @IntRange(from = 1, to = 255) int seqNumber, + @IntRange(from = 1, to = 255) int msgCount) { byte[] data; SmsHeader.ConcatRef concatRef = new SmsHeader.ConcatRef(); concatRef.refNumber = refNumber;