commit ec97142c01d14b9b3d0d50ba3285fb2942d2ac6a
author Roshan Pius <rpius@google.com> Fri Aug 21 20:36:34 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 21 20:36:34 2015 +0000
tree 72c121d98d2a746a38efa1b2bea30fcf4cf839cc
parent d2e198dc57290e694f9f74122d5389b16bbc046d
parent 410dd122d5656db5cff0d35cdbbcbe09b5fd00d6

Merge "Copy the connect time on SRVCC to new connection" into mnc-dr-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 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