commit 3a4da507fdbbc25741c43d40f452592d8174f2c7
author Narendra <nagarw@codeaurora.org> Thu Jan 05 20:26:30 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 05 20:26:30 2017 +0000
tree c2d79ccdf0698617cf69ba91eb9b70f3b99f9606
parent bc01a3edc39f2e64c2a581bbdff16db828651649
parent 8590508144f14c67b73f493fd9a5fc8e34dbfdcd

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

Change-Id: I29a6575bcf39b779021f9e3bb84297a951d74ac8

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