| commit | c3028357d3a12ce79662b22dff45807e79ede5f1 | [log] [tgz] |
|---|---|---|
| author | Brad Ebinger <breadley@google.com> | Wed Feb 03 18:13:03 2021 +0000 |
| committer | Brad Ebinger <breadley@google.com> | Fri Feb 05 19:04:37 2021 +0000 |
| tree | 31a07f1b01f0490bcb9bbc8947ad3a7750412df0 | |
| parent | 743d669c07217ff2a38e8fa839089929db5d3848 [diff] |
Integrate crash fixes Bring in cl/355393342, cl/355399665 Bug: 179175447 Test: manual Change-Id: Iaff65f6c0da9f063f5311ac8a3a94f2df821e909
diff --git a/testapps/TestRcsApp/aosp_test_rcsclient/src/com/android/libraries/rcs/simpleclient/registration/MessageConverter.java b/testapps/TestRcsApp/aosp_test_rcsclient/src/com/android/libraries/rcs/simpleclient/registration/MessageConverter.java index bffb938..75eb48d 100644 --- a/testapps/TestRcsApp/aosp_test_rcsclient/src/com/android/libraries/rcs/simpleclient/registration/MessageConverter.java +++ b/testapps/TestRcsApp/aosp_test_rcsclient/src/com/android/libraries/rcs/simpleclient/registration/MessageConverter.java
@@ -67,7 +67,9 @@ .append(length) .append("\r\n"); - return new SipMessage(startLine, headers.toString(), message.getRawContent()); + byte[] rawContent = message.getRawContent(); + rawContent = rawContent == null ? new byte[0] : message.getRawContent(); + return new SipMessage(startLine, headers.toString(), rawContent); } public static Message toStackMessage(SipMessage message) throws ParseException {
diff --git a/testapps/TestRcsApp/aosp_test_rcsclient/src/com/android/libraries/rcs/simpleclient/service/chat/SimpleChatSession.java b/testapps/TestRcsApp/aosp_test_rcsclient/src/com/android/libraries/rcs/simpleclient/service/chat/SimpleChatSession.java index b72f861..0393063 100644 --- a/testapps/TestRcsApp/aosp_test_rcsclient/src/com/android/libraries/rcs/simpleclient/service/chat/SimpleChatSession.java +++ b/testapps/TestRcsApp/aosp_test_rcsclient/src/com/android/libraries/rcs/simpleclient/service/chat/SimpleChatSession.java
@@ -210,7 +210,9 @@ return Futures.immediateFuture(null); } try { - mMsrpSession.terminate(); + if (mMsrpSession != null) { + mMsrpSession.terminate(); + } } catch (IOException e) { return Futures.immediateFailedFuture( new ChatServiceException(