commit 8590508144f14c67b73f493fd9a5fc8e34dbfdcd
author Narendra <nagarw@codeaurora.org> Thu Jan 05 20:23:01 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 05 20:23:01 2017 +0000
tree c2d79ccdf0698617cf69ba91eb9b70f3b99f9606
parent 807a3a35d6f22ababf10b6627c2e6338830e4c0c
parent 7fc24728ccc2171d513fbf50533f107daba89e8c

Merge "Fix conference call duration issue" am: c4a1ab0a73
am: 7fc24728cc

Change-Id: I03e1afca96b26a9bd4f6f14f745d02aab99a3742

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);
+            }
         }
     }