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

Merge "Create a new API to decode Sms PDU" am: 7a837f162f am: 178b219963

Browse Source 
Change-Id: I2ea418a6542d2f4cfdac235a1d9c2476c5b297f3
This commit is contained in:
Automerger Merge Worker
2020-01-16 03:15:45 +00:00
parent d19804ce39 178b219963
commit 58cebe2cd7
2 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -9135,6 +9135,7 @@ package android.telephony {
} }
public class SmsMessage { public class SmsMessage {
method @Nullable public static android.telephony.SmsMessage createFromNativeSmsSubmitPdu(@NonNull byte[], boolean);
method @NonNull @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public static byte[] getSubmitPduEncodedMessage(boolean, @NonNull String, @NonNull String, int, int, int, int, int, int); method @NonNull @RequiresPermission(android.Manifest.permission.BLUETOOTH_PRIVILEGED) public static byte[] getSubmitPduEncodedMessage(boolean, @NonNull String, @NonNull String, int, int, int, int, int, int);
} }

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

@@ -331,6 +331,34 @@ public class SmsMessage {
return wrappedMessage != null ? new SmsMessage(wrappedMessage) : null; 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) {
SmsMessageBase wrappedMessage;
if (isCdma) {
wrappedMessage = com.android.internal.telephony.cdma.SmsMessage.createFromEfRecord(
0, data);
} else {
// Bluetooth uses its own method to decode GSM PDU so this part is not called.
wrappedMessage = com.android.internal.telephony.gsm.SmsMessage.createFromEfRecord(
0, data);
}
return wrappedMessage != null ? new SmsMessage(wrappedMessage) : null;
}
/** /**
* Get the TP-Layer-Length for the given SMS-SUBMIT PDU Basically, the * Get the TP-Layer-Length for the given SMS-SUBMIT PDU Basically, the
* length in bytes (not hex chars) less the SMSC header * length in bytes (not hex chars) less the SMSC header