commit d16c11b58e6b218529ae5d2c0b1547e303079138
author Pranav Madapurmath <pmadapurmath@google.com> Thu Feb 22 18:33:09 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 22 18:33:09 2024 +0000
tree 13acdb44ca64b098ae866a2bf0fd9811332a9cba
parent b817d2acacf384e971c67f07dfc810b4810745b1
parent fba24878abfb6119dc6462344b5497fa83c68954

Merge "Prevent reset of EmergencyCallDiagnosticLogger active call timestamp" into main

src/com/android/server/telecom/EmergencyCallDiagnosticLogger.java

diff --git a/src/com/android/server/telecom/EmergencyCallDiagnosticLogger.java b/src/com/android/server/telecom/EmergencyCallDiagnosticLogger.java
index f1a4a97..cce8c66 100644
--- a/src/com/android/server/telecom/EmergencyCallDiagnosticLogger.java
+++ b/src/com/android/server/telecom/EmergencyCallDiagnosticLogger.java
@@ -339,12 +339,11 @@
     @Override
     public void onCallStateChanged(Call call, int oldState, int newState) {
 
-        if (call != null && mEmergencyCallsMap.get(call) != null && newState == CallState.ACTIVE) {
-            CallEventTimestamps ts = mEmergencyCallsMap.get(call);
-            if (ts != null) {
-                long currentTime = mClockProxy.currentTimeMillis();
-                ts.setCallActiveTime(currentTime);
-            }
+        CallEventTimestamps ts = mEmergencyCallsMap.get(call);
+        if (call != null && ts != null && newState == CallState.ACTIVE
+                && ts.getCallActiveTime() == 0) {
+            long currentTime = mClockProxy.currentTimeMillis();
+            ts.setCallActiveTime(currentTime);
         }
     }