diff options
| author | Svet Ganov <svetoslavganov@google.com> | 2020-04-30 23:45:15 -0700 |
|---|---|---|
| committer | Svetoslav Ganov <svetoslavganov@google.com> | 2020-05-03 05:38:43 +0000 |
| commit | d459a8da1ec7c18e86795f4f0f3512c70c885a84 (patch) | |
| tree | b8ff46c0c4bca0225e5965a66c88fc58c3c10b81 /telephony/java | |
| parent | 87ccbfaa4638773f55854e8b2ca3d4c6b1ea57f7 (diff) | |
Revert an API breaking changes
bug:150281259
Test: N/A
Exempt-From-Owner-Approval: porting upstream
Change-Id: Ie30286456af15dd7b81bceb0547ffe8bfac422d2
Merged-In: Ie30286456af15dd7b81bceb0547ffe8bfac422d2
Diffstat (limited to 'telephony/java')
| -rw-r--r-- | telephony/java/android/service/euicc/EuiccService.java | 4 | ||||
| -rw-r--r-- | telephony/java/android/telephony/SmsMessage.java | 17 |
2 files changed, 19 insertions, 2 deletions
diff --git a/telephony/java/android/service/euicc/EuiccService.java b/telephony/java/android/service/euicc/EuiccService.java index ae2652e6c229..fcbb008c79b3 100644 --- a/telephony/java/android/service/euicc/EuiccService.java +++ b/telephony/java/android/service/euicc/EuiccService.java @@ -327,8 +327,8 @@ public abstract class EuiccService extends Service { * @throws UnsupportedOperationException when sections has more than four layers (e.g 5.8.1.2) * or when an number is bigger than 15 */ - public int encodeSmdxSubjectAndReasonCode(@NonNull String subjectCode, - @NonNull String reasonCode) { + public int encodeSmdxSubjectAndReasonCode(@Nullable String subjectCode, + @Nullable String reasonCode) { final int maxSupportedSection = 3; final int maxSupportedDigit = 15; final int bitsPerSection = 4; diff --git a/telephony/java/android/telephony/SmsMessage.java b/telephony/java/android/telephony/SmsMessage.java index e7a92e8c4638..347dcc81ce4e 100644 --- a/telephony/java/android/telephony/SmsMessage.java +++ b/telephony/java/android/telephony/SmsMessage.java @@ -339,6 +339,23 @@ 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 * |