diff options
author | Narendra <nagarw@codeaurora.org> | 2017-01-05 20:23:01 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-01-05 20:23:01 +0000 |
commit | 8590508144f14c67b73f493fd9a5fc8e34dbfdcd (patch) | |
tree | c2d79ccdf0698617cf69ba91eb9b70f3b99f9606 /InCallUI/src/com/android/incallui/CallCardPresenter.java | |
parent | 807a3a35d6f22ababf10b6627c2e6338830e4c0c (diff) | |
parent | 7fc24728ccc2171d513fbf50533f107daba89e8c (diff) |
Merge "Fix conference call duration issue" am: c4a1ab0a73
am: 7fc24728cc
Change-Id: I03e1afca96b26a9bd4f6f14f745d02aab99a3742
Diffstat (limited to 'InCallUI/src/com/android/incallui/CallCardPresenter.java')
-rw-r--r-- | InCallUI/src/com/android/incallui/CallCardPresenter.java | 6 |
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); + } } } |