commit b7e749cfd763db446bfd744554279254aa5a900a
author Roshan Pius <rpius@google.com> Thu Jul 16 23:24:21 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jul 16 23:24:21 2015 +0000
tree 01b56ce6686ae7cdb27c858149f0717cf401903d
parent 3f7a8a1a643a39163f22d164544ea9adbe16bd6a
parent 8d9d3b92602d4a133534116588823ede92e9df88

am 8d9d3b92: Merge "Maintain call time across SRVCC (3/3)." into mnc-dev

* commit '8d9d3b92602d4a133534116588823ede92e9df88':
  Maintain call time across SRVCC (3/3).

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 02b6e99..02d057f 100644
--- a/src/com/android/services/telephony/ImsConference.java
+++ b/src/com/android/services/telephony/ImsConference.java
@@ -229,7 +229,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);