commit c4a1ab0a731d28e5701a58e08a3eac0d6e0f1dc4
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jan 05 20:13:15 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 05 20:13:16 2017 +0000
tree 6cb565c4d260c7d6c842227a93a1caab275eef40
parent b94019f32f3d82f7027bf91685de1dbe5b8add58
parent dc59d4190b4ab808274ec8ce825b26b1fea1b685

Merge "Fix conference call duration issue"

InCallUI/src/com/android/incallui/CallCardPresenter.java

diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java
index 10bf5e6..76dd849 100644
--- a/InCallUI/src/com/android/incallui/CallCardPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java
@@ -541,8 +541,10 @@
             mCallTimer.cancel();
         } else {
             final long callStart = mPrimary.getConnectTimeMillis();
-            final long duration = System.currentTimeMillis() - callStart;
-            ui.setPrimaryCallElapsedTime(true, duration);
+            if (callStart > 0) {
+                final long duration = System.currentTimeMillis() - callStart;
+                ui.setPrimaryCallElapsedTime(true, duration);
+            }
         }
     }