diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-01-05 20:13:15 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-01-05 20:13:16 +0000 |
commit | c4a1ab0a731d28e5701a58e08a3eac0d6e0f1dc4 (patch) | |
tree | 6cb565c4d260c7d6c842227a93a1caab275eef40 /InCallUI/src/com/android/incallui/CallCardPresenter.java | |
parent | b94019f32f3d82f7027bf91685de1dbe5b8add58 (diff) | |
parent | dc59d4190b4ab808274ec8ce825b26b1fea1b685 (diff) |
Merge "Fix conference call duration issue"
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); + } } } |