From bd1f9ece87e842e09b9967f94858f9f5b9ee7268 Mon Sep 17 00:00:00 2001
From: Tyler Gunn <tgunn@google.com>
Date: Thu, 16 Apr 2015 08:38:10 -0700
Subject: [PATCH] Fix incorrect Conference time for IMS conference calls.

Looks like the connectTimeMillis parameter to ParcelableConference
got removed when partner CLs were merged in.  Adding it back fixes
the problem.

Bug: 20159830
Change-Id: Ibe067f64f8faea6fd1eb157e5073bc702978c511
---
 telecomm/java/android/telecom/ParcelableConference.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/telecomm/java/android/telecom/ParcelableConference.java b/telecomm/java/android/telecom/ParcelableConference.java
index ab825491a57cb..6a221e65c05b4 100644
--- a/telecomm/java/android/telecom/ParcelableConference.java
+++ b/telecomm/java/android/telecom/ParcelableConference.java
@@ -130,7 +130,7 @@ public final class ParcelableConference implements Parcelable {
             int videoState = source.readInt();
 
             return new ParcelableConference(phoneAccount, state, capabilities, connectionIds,
-                    videoCallProvider, videoState);
+                    videoCallProvider, videoState, connectTimeMillis);
         }
 
         @Override