commit 92ea8c127ffa8364cd46023a493d5320c862b01d
author Linux Build Service Account <lnxbuild@localhost> Wed Jan 11 22:15:54 2017 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Jan 11 22:15:54 2017 -0800
tree 68aad7792b6f154657d3449ab3782d5e5d0ba1c9
parent 65f0557c3f78fe7574082f0a8657438805072094
parent 48b7c8973dc5c19b024c8bf848edb0f5ae3c9218

Merge "Fix call duration issue for conference" into atel.lnx.2.0-dev

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 596d9da..63d98f4 100644
--- a/InCallUI/src/com/android/incallui/CallCardPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java
@@ -566,7 +566,10 @@
             ui.setPrimaryCallElapsedTime(false, 0);
             mCallTimer.cancel();
         } else {
-            ui.setPrimaryCallElapsedTime(true, mPrimary.getCallDuration());
+            final long connectTime = mPrimary.getConnectTimeMillis();
+            if (connectTime > 0) {
+                ui.setPrimaryCallElapsedTime(true, mPrimary.getCallDuration());
+            }
         }
     }