Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Replace createSmsSubmitPdu with createFromNativeSmsSubmitPdu" am: ab2c1e5777 am: 52937545e4 am: 391e64a11c

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

Change-Id: I636a73921e61d466dca66155b67cbc036a8b0200
This commit is contained in:
Zongheng Wang
2021-03-23 20:33:04 +00:00
committed by Automerger Merge Worker
parent 592b9daa1c 391e64a11c
commit 9b8c0d2a6a
2 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

@@ -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();

22
telephony/java/android/telephony/SmsMessage.java
View File

@@ -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