From 7b8f79b64104ac41c40ff85c2024c19903a42881 Mon Sep 17 00:00:00 2001 From: Zongheng Wang Date: Tue, 23 Mar 2021 00:10:51 +0000 Subject: Replace createSmsSubmitPdu with createFromNativeSmsSubmitPdu Test: atest bluetooth_test_common Test: atest CtsTelephonyTestCases Bug: 183051612 Change-Id: If15d31eb699e2c5d3e371628dba8adbaa9bbebfa --- core/api/current.txt | 1 - 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 28d492c70f09..e0134e58a8f3 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -40751,7 +40751,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) { @@ -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 -- cgit v1.2.3