commit c12799c479dee0dbb31c85e1e3b7c7c43586db60
author Roshan Pius <rpius@google.com> Sat Aug 22 00:40:41 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Aug 22 00:40:41 2015 +0000
tree 1f1973ff215181fd6712c456f960fd54e7fef731
parent abcb07b40fe8411b2e76aaae84ce28181327a2de
parent ca47f541838fc06dcec9847727e3982952a276a9

am ca47f541: am 264f86a1: am 9b01906b: am ec97142c: Merge "Copy the connect time on SRVCC to new connection" into mnc-dr-dev

* commit 'ca47f541838fc06dcec9847727e3982952a276a9':
  Copy the connect time on SRVCC to new connection

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 f4c6438..7105b50 100644
--- a/src/com/android/services/telephony/ImsConference.java
+++ b/src/com/android/services/telephony/ImsConference.java
@@ -657,6 +657,8 @@
             if (mConferenceHost.getPhone().getPhoneType() == PhoneConstants.PHONE_TYPE_GSM) {
                 GsmConnection c = new GsmConnection(originalConnection);
                 c.updateState();
+                // Copy the connect time from the conferenceHost
+                c.setConnectTimeMillis(mConferenceHost.getConnectTimeMillis());
                 mTelephonyConnectionService.addExistingConnection(phoneAccountHandle, c);
                 mTelephonyConnectionService.addConnectionToConferenceController(c);
             } // CDMA case not applicable for SRVCC