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

Commit 38bb7285 authored by Zongheng Wang's avatar Zongheng Wang
Browse files

Change javadoc of getSubmitPduEncodedMessage and add IntRange to its 

parameters

To resolve merge conflict for aosp/1242353. Cherrypick it to rvc-dev since this should be in R.

Bug: 149697039
Test: compile
Change-Id: I5e131f71c376db56d3b7aa835058f0d2f4e8566a
Merged-In: I5e131f71c376db56d3b7aa835058f0d2f4e8566a
(cherry picked from commit 1d2378bd)
parent e6d6f5f8

api/system-current.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -11526,7 +11526,7 @@ package android.telephony { 
  public class SmsMessage {

  public class SmsMessage {

    method @Nullable public static android.telephony.SmsMessage createFromNativeSmsSubmitPdu(@NonNull byte[], boolean);

    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 @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 {







  public class SubscriptionInfo implements android.os.Parcelable {

























telephony/java/android/telephony/SmsMessage.java



+12
−8




























Original line number
Original line
Diff line number
Diff line








@@ -20,6 +20,7 @@ import static android.telephony.TelephonyManager.PHONE_TYPE_CDMA;





























import android.Manifest;







import android.Manifest;











import android.annotation.IntDef;







import android.annotation.IntDef;














import android.annotation.IntRange;











import android.annotation.NonNull;







import android.annotation.NonNull;











import android.annotation.Nullable;







import android.annotation.Nullable;











import android.annotation.RequiresPermission;







import android.annotation.RequiresPermission;










@@ -719,9 +720,9 @@ public class SmsMessage {









     *                      23.040 9.2.3.24.16







     *                      23.040 9.2.3.24.16











     * @param languageShiftTable GSM national language shift table to use, specified by 3GPP







     * @param languageShiftTable GSM national language shift table to use, specified by 3GPP











     *                           23.040 9.2.3.24.15







     *                           23.040 9.2.3.24.15











     * @param refNumber parameter to create SmsHeader







     * @param refNumber reference number of concatenated SMS, specified by 3GPP 23.040 9.2.3.24.1











     * @param seqNumber parameter to create SmsHeader







     * @param seqNumber sequence number of concatenated SMS, specified by 3GPP 23.040 9.2.3.24.1











     * @param msgCount parameter to create SmsHeader







     * @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







     * @return a byte[] containing the encoded message











     *







     *











     * @hide







     * @hide









@@ -732,9 +733,12 @@ public class SmsMessage {









    public static byte[] getSubmitPduEncodedMessage(boolean isTypeGsm,







    public static byte[] getSubmitPduEncodedMessage(boolean isTypeGsm,











                                                    @NonNull String destinationAddress,







                                                    @NonNull String destinationAddress,











                                                    @NonNull String message,







                                                    @NonNull String message,











            @EncodingSize int encoding, int languageTable,







                                                    @EncodingSize int encoding,











            int languageShiftTable, int refNumber,







                                                    @IntRange(from = 0) int languageTable,











            int seqNumber, int msgCount) {







                                                    @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;







        byte[] data;











        SmsHeader.ConcatRef concatRef = new SmsHeader.ConcatRef();







        SmsHeader.ConcatRef concatRef = new SmsHeader.ConcatRef();











        concatRef.refNumber = refNumber;







        concatRef.refNumber = refNumber;