summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZongheng Wang <wangzongheng@google.com>2021-03-23 00:10:51 +0000
committerHansong Zhang <hsz@google.com>2021-03-22 21:31:58 -0700
commit7b8f79b64104ac41c40ff85c2024c19903a42881 (patch)
tree4328db1d849fa50b93d46e95580a838f15b183dd
parentbc92c6eb23ef5f8c27a5ef3ae46c3cbb66b037f0 (diff)
Replace createSmsSubmitPdu with createFromNativeSmsSubmitPdu
Test: atest bluetooth_test_common Test: atest CtsTelephonyTestCases Bug: 183051612 Change-Id: If15d31eb699e2c5d3e371628dba8adbaa9bbebfa
-rw-r--r--core/api/current.txt1
-rw-r--r--telephony/java/android/telephony/SmsMessage.java22
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) {
@@ -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
*