diff options
| author | 2021-04-14 03:01:13 +0000 | |
|---|---|---|
| committer | 2021-04-14 03:01:13 +0000 | |
| commit | 11d3489ba11439c71db38149fbd37368bb5bdeb9 (patch) | |
| tree | a59e62c24d297c0ec2a7273c2e323bc386f1e05d | |
| parent | 53ba81415062936f6cf57316d58ac6a1ad4426d6 (diff) | |
| parent | 85f4d04ef2679d35e48117d5cf8d18a6a44bd3f7 (diff) | |
Merge "[RCS]Migrate from getEncodedMessage() to toEncodedMessage()" am: 23bbd41fde am: bf7c109ed6 am: 85f4d04ef2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671789
Change-Id: Iea60a39cb6fc3b2d5ed5732111b18fb64bf0bcdf
| -rw-r--r-- | core/api/system-current.txt | 1 | ||||
| -rw-r--r-- | telephony/java/android/telephony/ims/SipMessage.java | 17 |
2 files changed, 0 insertions, 18 deletions
diff --git a/core/api/system-current.txt b/core/api/system-current.txt index ce408d1a80f1..8d03d17f1308 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -13627,7 +13627,6 @@ package android.telephony.ims { method public int describeContents(); method @Nullable public String getCallIdParameter(); method @NonNull public byte[] getContent(); - method @Deprecated @NonNull public byte[] getEncodedMessage(); method @NonNull public String getHeaderSection(); method @NonNull public String getStartLine(); method @NonNull public String getViaBranchParameter(); diff --git a/telephony/java/android/telephony/ims/SipMessage.java b/telephony/java/android/telephony/ims/SipMessage.java index d21fcab264d3..391372ac8ac1 100644 --- a/telephony/java/android/telephony/ims/SipMessage.java +++ b/telephony/java/android/telephony/ims/SipMessage.java @@ -203,23 +203,6 @@ public final class SipMessage implements Parcelable { } /** - * @return the UTF-8 encoded SIP message. - * @deprecated Use {@link #toEncodedMessage} instead - */ - @Deprecated - public @NonNull byte[] getEncodedMessage() { - byte[] header = new StringBuilder() - .append(mStartLine) - .append(mHeaderSection) - .append(CRLF) - .toString().getBytes(UTF_8); - byte[] sipMessage = new byte[header.length + mContent.length]; - System.arraycopy(header, 0, sipMessage, 0, header.length); - System.arraycopy(mContent, 0, sipMessage, header.length, mContent.length); - return sipMessage; - } - - /** * According RFC-3261 section 7, SIP is a text protocol and uses the UTF-8 charset. Its format * consists of a start-line, one or more header fields, an empty line indicating the end of the * header fields, and an optional message-body. |