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

Commit 8c162d4b authored by Cheuksan Wang's avatar Cheuksan Wang Committed by Android Partner Code Review
Browse files

Merge "Update the SmsMessage.createFromPdu() API call" into m-wireless-dev

parents 665fffc9 b12b6f72

src/java/android/telephony/SmsMessage.java

+12 −9
Original line number Diff line number Diff line
@@ -149,17 +149,18 @@ public class SmsMessage { 
    }



    /**

     * Create an SmsMessage from a raw PDU.

     *

     * <p><b>This method will soon be deprecated</b> and all applications which handle

     * Create an SmsMessage from a raw PDU. Guess format based on Voice

     * technology first, if it fails use other format.

     * All applications which handle

     * incoming SMS messages by processing the {@code SMS_RECEIVED_ACTION} broadcast

     * intent <b>must</b> now pass the new {@code format} String extra from the intent

     * into the new method {@code createFromPdu(byte[], String)} which takes an

     * extra format parameter. This is required in order to correctly decode the PDU on

     * devices that require support for both 3GPP and 3GPP2 formats at the same time,

     * such as dual-mode GSM/CDMA and CDMA/LTE phones.  Guess format based on Voice

     * technology first, if it fails use other format.

     * such as dual-mode GSM/CDMA and CDMA/LTE phones.

     * @deprecated Use {@link #createFromPdu(byte[], String)} instead.

     */

    @Deprecated

    public static SmsMessage createFromPdu(byte[] pdu) {

         SmsMessage message = null;
@@ -181,13 +182,15 @@ public class SmsMessage { 


    /**

     * Create an SmsMessage from a raw PDU with the specified message format. The

     * message format is passed in the {@code SMS_RECEIVED_ACTION} as the {@code format}

     * message format is passed in the

     * {@link android.provider.Telephony.Sms.Intents#SMS_RECEIVED_ACTION} as the {@code format}

     * String extra, and will be either "3gpp" for GSM/UMTS/LTE messages in 3GPP format

     * or "3gpp2" for CDMA/LTE messages in 3GPP2 format.

     *

     * @param pdu the message PDU from the SMS_RECEIVED_ACTION intent

     * @param format the format extra from the SMS_RECEIVED_ACTION intent

     * @hide pending API council approval

     * @param pdu the message PDU from the

     * {@link android.provider.Telephony.Sms.Intents#SMS_RECEIVED_ACTION} intent

     * @param format the format extra from the

     * {@link android.provider.Telephony.Sms.Intents#SMS_RECEIVED_ACTION} intent

     */

    public static SmsMessage createFromPdu(byte[] pdu, String format) {

        SmsMessageBase wrappedMessage;