diff options
| author | 2021-03-23 19:11:15 +0000 | |
|---|---|---|
| committer | 2021-03-23 19:11:15 +0000 | |
| commit | 52937545e47284aa0e7fe1273297d5826e1f392f (patch) | |
| tree | 6a0d635060475ed0be6e20f23828968c86915337 | |
| parent | c1d92b8ddda685655679d2c98ac81179fcbe03c3 (diff) | |
| parent | ab2c1e5777a101bdfb76b8b6319ad7649f49ba35 (diff) | |
Merge "Replace createSmsSubmitPdu with createFromNativeSmsSubmitPdu" am: ab2c1e5777
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649709
Change-Id: I8e87c29326fdfd38f47f9ec04ab371fffdd75ed3
| -rw-r--r-- | core/api/current.txt | 1 | ||||
| -rw-r--r-- | telephony/java/android/telephony/SmsMessage.java | 22 |
2 files changed, 4 insertions, 19 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 419fe908e3d4..9057203f944b 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -40663,7 +40663,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(); diff --git a/telephony/java/android/telephony/SmsMessage.java b/telephony/java/android/telephony/SmsMessage.java index cfb29f124b43..5a12865fb2a0 100644 --- a/telephony/java/android/telephony/SmsMessage.java +++ b/telephony/java/android/telephony/SmsMessage.java @@ -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) { @@ -318,23 +321,6 @@ public class SmsMessage { } /** - * 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 * |