commit 637ca35f0f16827ac4e4c6d2532ed05c20920706
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 3069423b9a8db24643fe0dbc2e9af7cba564d377
parent 807067d4078d74d51b631f0dfdde8a38bd1b3200
parent f537a087c31725c49c8271d5fd336c344d36336d

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

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2923871

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

src/java/com/android/internal/telephony/metrics/RcsStats.java

diff --git a/src/java/com/android/internal/telephony/metrics/RcsStats.java b/src/java/com/android/internal/telephony/metrics/RcsStats.java
index 8d24def..20b23f9 100644
--- a/src/java/com/android/internal/telephony/metrics/RcsStats.java
+++ b/src/java/com/android/internal/telephony/metrics/RcsStats.java
@@ -1029,8 +1029,11 @@
     }
 
     /** invalidated result when Request message is sent */
-    public synchronized void invalidatedMessageResult(int subId, String sipMessageMethod,
-            int sipMessageDirection, int messageError) {
+    public synchronized void invalidatedMessageResult(String callId, int subId,
+            String sipMessageMethod, int sipMessageDirection, int messageError) {
+        if (mSipMessage == null) {
+            mSipMessage = new SipMessageArray(sipMessageMethod, sipMessageDirection, callId);
+        }
         mSipMessage.addSipMessageStat(subId, sipMessageMethod, 0,
                 sipMessageDirection, messageError);
     }