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

1 files changed, 5 insertions, 2 deletions

diff --git a/src/java/com/android/internal/telephony/metrics/RcsStats.java b/src/java/com/android/internal/telephony/metrics/RcsStats.java
index 8d24defb2b..20b23f94cb 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 @@ public class RcsStats {
     }
 
     /** 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);
     }