commit f789e6e1f9e67e26d13305c494f00254b92f63f3
author Tyler Gunn <tgunn@google.com> Thu Aug 20 09:24:51 2015 -0700
committer Tyler Gunn <tgunn@google.com> Thu Aug 20 09:24:51 2015 -0700
tree 66b0303ceff080c2b3d4b127ffbd85aeacda6f57
parent 924bebf7c4a2a09f0ef27b8f849fbbbab8c939a5

Fix issue where conference timer resets to 0 when CEP enabled.

The problem was due to the fact that when we have children for a conference,
Telecom uses the oldest child's start time.  In the case of the CEP
participants all had no defined start time so they defaulted to using
the time when the conference was started.

Changed so that the child connections get the ImsConference's start time
(which is the start time of the oldest original call merged to form
the conference).

Bug: 23381612
Change-Id: I95766c113e7cfe2fa3b80a616bdfd9417b744dc3

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 8c05c87..f4c6438 100644
--- a/src/com/android/services/telephony/ImsConference.java
+++ b/src/com/android/services/telephony/ImsConference.java
@@ -583,6 +583,7 @@
         ConferenceParticipantConnection connection = new ConferenceParticipantConnection(
                 parent.getOriginalConnection(), participant);
         connection.addConnectionListener(mParticipantListener);
+        connection.setConnectTimeMillis(parent.getConnectTimeMillis());
 
         if (Log.VERBOSE) {
             Log.v(this, "createConferenceParticipantConnection: %s", connection);