commit bb070f14b0b614247fa3d30fd6b3555cb7d6b79f
author Sungcheol Ahn <donaldahn@google.com> Tue Jan 30 04:50:45 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jan 30 04:50:45 2024 +0000
tree cd9a139f0ee2a6599404bed1b90f0a52d86a7b72
parent b4ac4187d88d4018b554b12b5a62180b0babef48
parent ca1b38408c52e33a1c1ad537a75a9e14cf1da2dd

Merge "[CTS] check if mSipMessage is null when sendmessage invalid" into main am: ca1b38408c

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/2923870

Change-Id: I57bcaf34a53a679b2d132f8880b996f6113558bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/com/android/services/telephony/rcs/TransportSipMessageValidator.java

diff --git a/src/com/android/services/telephony/rcs/TransportSipMessageValidator.java b/src/com/android/services/telephony/rcs/TransportSipMessageValidator.java
index b15992e..3a8bdea 100644
--- a/src/com/android/services/telephony/rcs/TransportSipMessageValidator.java
+++ b/src/com/android/services/telephony/rcs/TransportSipMessageValidator.java
@@ -565,8 +565,8 @@
                         direction);
             } else {
                 //Message sending fail and there is no response.
-                mRcsStats.invalidatedMessageResult(mSubId, startLineSegments[0], direction,
-                        result.restrictedReason);
+                mRcsStats.invalidatedMessageResult(m.getCallIdParameter(), mSubId,
+                        startLineSegments[0], direction, result.restrictedReason);
             }
         } else if (SipMessageParsingUtils.isSipResponse(m.getStartLine())) {
             int statusCode = Integer.parseInt(startLineSegments[1]);