Merge "Fix conference call duration issue" am: c4a1ab0a73

am: 7fc24728cc

Change-Id: I03e1afca96b26a9bd4f6f14f745d02aab99a3742

1 files changed, 4 insertions, 2 deletions

diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java
index 10bf5e612..76dd84928 100644
--- a/InCallUI/src/com/android/incallui/CallCardPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java
@@ -541,8 +541,10 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi>
             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);
+            }
         }
     }