commit cd5d33c89f25b3bfe8989d55f05702d0970c13b4
author Tyler Gunn <tgunn@google.com> Mon Jan 12 09:02:01 2015 -0800
committer Tyler Gunn <tgunn@google.com> Mon Jan 12 09:02:01 2015 -0800
tree de152360f527e8080c703c30c9a29c9b827e323b
parent 1eee52b1aa0ba0cc05ac513d0fa91de9ee643faf

Fix for call timer resetting when starting IMS conference call. 1/4

- Added support in Conference for specifying the connect time when the
conference is created.

Bug: 18959443
Change-Id: I501edde3b62f6bf021eb7455089e80626013da12

telecomm/java/android/telecom/ConnectionService.java

diff --git a/telecomm/java/android/telecom/ConnectionService.java b/telecomm/java/android/telecom/ConnectionService.java
index df16375..dfdc3e1 100644
--- a/telecomm/java/android/telecom/ConnectionService.java
+++ b/telecomm/java/android/telecom/ConnectionService.java
@@ -883,7 +883,8 @@
                     conference.getPhoneAccountHandle(),
                     conference.getState(),
                     conference.getConnectionCapabilities(),
-                    connectionIds);
+                    connectionIds,
+                    conference.getConnectTimeMillis());
             mAdapter.addConferenceCall(id, parcelableConference);
 
             // Go through any child calls and set the parent.