commit b7806d91d7c4583449c9986932e38a9dc6821870
author Tyler Gunn <tgunn@google.com> Tue Jan 13 20:43:15 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 13 20:43:16 2015 +0000
tree 9ebfd51fee343d51f1cc581dc2b2d056693d5b42
parent f67832f67f330e645ea6109feb108bf7dd854155
parent fba8553cc6e449d80b52b2ea74d9779888ed779b

Merge "Fix for call timer resetting when starting IMS conference call. 3/4" into lmp-mr1-dev

src/com/android/services/telephony/ImsConference.java

diff --git a/src/com/android/services/telephony/ImsConference.java b/src/com/android/services/telephony/ImsConference.java
index 5a15a47..e692a30 100644
--- a/src/com/android/services/telephony/ImsConference.java
+++ b/src/com/android/services/telephony/ImsConference.java
@@ -177,6 +177,11 @@
             TelephonyConnection conferenceHost) {
 
         super(null);
+
+        // Specify the connection time of the conference to be the connection time of the original
+        // connection.
+        setConnectTimeMillis(conferenceHost.getOriginalConnection().getConnectTime());
+
         mTelephonyConnectionService = telephonyConnectionService;
         setConferenceHost(conferenceHost);
         if (conferenceHost != null && conferenceHost.getCall() != null