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

Commit 268ed6a6 authored by Zongheng Wang's avatar Zongheng Wang Committed by Automerger Merge Worker
Browse files

Merge "Replace createSmsSubmitPdu with createFromNativeSmsSubmitPdu" am:... 

Merge "Replace createSmsSubmitPdu with createFromNativeSmsSubmitPdu" am: ab2c1e57 am: 52937545 am: 391e64a1 am: 9b8c0d2a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649709

Change-Id: Ifd8efa5ee12cb802f64cfc23b429aba58c468937
parents a49e0c9b 9b8c0d2a

core/api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -42053,7 +42053,6 @@ 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();

telephony/java/android/telephony/SmsMessage.java

+4 −18
Original line number Diff line number Diff line
@@ -300,9 +300,12 @@ 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 createSmsSubmitPdu(@NonNull byte[] data, boolean isCdma) {

    public static SmsMessage createFromNativeSmsSubmitPdu(@NonNull byte[] data, boolean isCdma) {

        SmsMessageBase wrappedMessage;



        if (isCdma) {
@@ -317,23 +320,6 @@ public class SmsMessage { 
        return wrappedMessage != null ? new SmsMessage(wrappedMessage) : null;

    }



    /**

     * Create an SmsMessage from a native SMS-Submit PDU, specified by Bluetooth Message Access

     * Profile Specification v1.4.2 5.8.

     * This is used by Bluetooth MAP profile to decode message when sending non UTF-8 SMS messages.

     *

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

        return null;

    }



    /**

     * Get the TP-Layer-Length for the given SMS-SUBMIT PDU Basically, the

     * length in bytes (not hex chars) less the SMSC header