diff options
| author | 2021-03-23 20:33:04 +0000 | |
|---|---|---|
| committer | 2021-03-23 20:33:04 +0000 | |
| commit | 9b8c0d2a6a575c1f69fecd8ee7f236bd9c2c4957 (patch) | |
| tree | 992ebcd022f65ab4a9fcc607934f25c35baa1f3c | |
| parent | 592b9daa1c5178d9b41c1a6f3ca615e1bfc04209 (diff) | |
| parent | 391e64a11c1d53bd289291ac8a3432a081a7eb4f (diff) | |
Merge "Replace createSmsSubmitPdu with createFromNativeSmsSubmitPdu" am: ab2c1e5777 am: 52937545e4 am: 391e64a11c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1649709
Change-Id: I636a73921e61d466dca66155b67cbc036a8b0200
| -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 bfc13b2f9616..ded5e1e5df53 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -42054,7 +42054,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 * |