Merge "Change javadoc of getSubmitPduEncodedMessage and add IntRange to its parameters" into rvc-dev
diff --git a/api/system-current.txt b/api/system-current.txt
index 379ae57..9f2953c 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -11523,7 +11523,7 @@
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 37d3d32..bc5cc96 100644
--- a/telephony/java/android/telephony/SmsMessage.java
+++ b/telephony/java/android/telephony/SmsMessage.java
@@ -20,6 +20,7 @@
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 @@
* 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
@@ -730,11 +731,14 @@
@SystemApi
@NonNull
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) {
+ @NonNull String destinationAddress,
+ @NonNull String message,
+ @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;