commit 8d9d3b92602d4a133534116588823ede92e9df88
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:22 2015 +0000
tree 3ced6351be90b37993e1e902f2fe952f844e2f2f
parent c3ff2ab897f4a80765474602987f527d6c713ac3
parent 2910db1d80f73cc070064329d29ffab8a72812f0

Merge "Maintain call time across SRVCC (3/3)." into mnc-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 6c4f48e..3dbf459 100644
--- a/src/com/android/services/telephony/ImsConference.java
+++ b/src/com/android/services/telephony/ImsConference.java
@@ -228,7 +228,10 @@
 
         // Specify the connection time of the conference to be the connection time of the original
         // connection.
-        setConnectTimeMillis(conferenceHost.getOriginalConnection().getConnectTime());
+        long connectTime = conferenceHost.getOriginalConnection().getConnectTime();
+        setConnectTimeMillis(connectTime);
+        // Set the connectTime in the connection as well.
+        conferenceHost.setConnectTimeMillis(connectTime);
 
         mTelephonyConnectionService = telephonyConnectionService;
         setConferenceHost(conferenceHost);