summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNarendra <nagarw@codeaurora.org>2017-01-05 20:30:02 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-01-05 20:30:02 +0000
commitd8976a96df2bf8389c40d32c1e7b06f77e469084 (patch)
treeb75cfa8fab8351e548042e11cc6e1d3ac48e5ff9
parente55f09367f56456494928b43645f855d401d0884 (diff)
parent3a4da507fdbbc25741c43d40f452592d8174f2c7 (diff)
Merge "Fix conference call duration issue" am: c4a1ab0a73 am: 7fc24728cc am: 8590508144
am: 3a4da507fd Change-Id: I346dae1f12e6b3ec9a68f89aaa1f782b31c81a7a
-rw-r--r--InCallUI/src/com/android/incallui/CallCardPresenter.java6
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 3761c5a7f..1ad0c11f1 100644
--- a/InCallUI/src/com/android/incallui/CallCardPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java
@@ -545,8 +545,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);
+ }
}
}