commit 03bb751bf63860523d255f8ec35419d9ec780e75
author Roshan Pius <rpius@google.com> Thu Jul 16 23:09:14 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 16 23:09:29 2015 +0000
tree fabea8d7b089fa36efc7fb0d1eee22fc07f4e2bf
parent f8d9780043253983435f6067ecb622df136e5dbc
parent 084ab0835ea9879185d3e6aa7f9be48ae4067bed

Merge "Maintain call time across SRVCC (1/3)." into mnc-dev

src/com/android/server/telecom/CallsManager.java

diff --git a/src/com/android/server/telecom/CallsManager.java b/src/com/android/server/telecom/CallsManager.java
index 297afa8..22e747e 100644
--- a/src/com/android/server/telecom/CallsManager.java
+++ b/src/com/android/server/telecom/CallsManager.java
@@ -1543,7 +1543,8 @@
                 null /* connectionManagerPhoneAccount */,
                 connection.getPhoneAccount(), /* targetPhoneAccountHandle */
                 false /* isIncoming */,
-                false /* isConference */);
+                false /* isConference */,
+                connection.getConnectTimeMillis() /* connectTimeMillis */);
 
         setCallState(call, Call.getStateFromConnectionState(connection.getState()),
                 "existing connection");

tests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java

diff --git a/tests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java b/tests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
index b7b4ba7..964f014 100644
--- a/tests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
+++ b/tests/src/com/android/server/telecom/tests/ConnectionServiceFixture.java
@@ -396,6 +396,7 @@
                 c.videoState,
                 false, /* ringback requested */
                 false, /* voip audio mode */
+                0, /* Connect Time for conf call on this connection */
                 c.statusHints,
                 c.disconnectCause,
                 c.conferenceableConnectionIds,