commit edffa4c2929ab57262068cfd33811d57478052d4
author Nancy Chen <nancychen@google.com> Thu Sep 11 20:22:21 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 11 20:22:21 2014 +0000
tree 0482a6ec24d74b839f917df2f31783b7d3ea749f
parent d51e4f90253a1a7551a9687139f4e34e6046f926
parent af28651e86d372991c05e5c32d60d07e87021936

Merge "Update TelecommManager per API requirements. (2/3)" into lmp-dev

src/com/android/telecomm/Call.java

diff --git a/src/com/android/telecomm/Call.java b/src/com/android/telecomm/Call.java
index 4a0198b..36eae30 100644
--- a/src/com/android/telecomm/Call.java
+++ b/src/com/android/telecomm/Call.java
@@ -190,7 +190,7 @@
 
     private PhoneAccountHandle mPhoneAccountHandle;
 
-    private long mConnectTimeMillis = System.currentTimeMillis();
+    private long mConnectTimeMillis = 0;
 
     /** The state of the call. */
     private int mState;

src/com/android/telecomm/CallsManager.java

diff --git a/src/com/android/telecomm/CallsManager.java b/src/com/android/telecomm/CallsManager.java
index 5445bef..546c847 100644
--- a/src/com/android/telecomm/CallsManager.java
+++ b/src/com/android/telecomm/CallsManager.java
@@ -744,6 +744,9 @@
                 true /* isConference */);
 
         setCallState(call, Call.getStateFromConnectionState(parcelableConference.getState()));
+        if (call.getState() == CallState.ACTIVE) {
+            call.setConnectTimeMillis(System.currentTimeMillis());
+        }
         call.setCallCapabilities(parcelableConference.getCapabilities());
 
         // TODO: Move this to be a part of addCall()