commit 4b9e5566861568cf032db663b487c627d9a53772
author Hall Liu <hallliu@google.com> Thu Jul 14 15:34:56 2016 -0700
committer Hall Liu <hallliu@google.com> Thu Jul 14 15:34:56 2016 -0700
tree 5cadbf974cb52e7963a11ec499f70d1060f86d1f
parent b5776701117dad69e3db903af38bf3e8553dc31f

Check for PROPERTY_IS_DOWNGRADED_CONFERENCE in addExistingConnection

If the property is set, create the new Call object as a conference.

Change-Id: I1e28fea1801a7ef6f3b7445f2f3ae4bb08c54c98
Fix: 29806833

src/com/android/server/telecom/CallsManager.java

diff --git a/src/com/android/server/telecom/CallsManager.java b/src/com/android/server/telecom/CallsManager.java
index d3b23c2..181eba8 100644
--- a/src/com/android/server/telecom/CallsManager.java
+++ b/src/com/android/server/telecom/CallsManager.java
@@ -2000,6 +2000,8 @@
      * @return The new call.
      */
     Call createCallForExistingConnection(String callId, ParcelableConnection connection) {
+        boolean isDowngradedConference = (connection.getConnectionProperties()
+                & Connection.PROPERTY_IS_DOWNGRADED_CONFERENCE) != 0;
         Call call = new Call(
                 callId,
                 mContext,
@@ -2015,7 +2017,7 @@
                 connection.getPhoneAccount(), /* targetPhoneAccountHandle */
                 Call.CALL_DIRECTION_UNDEFINED /* callDirection */,
                 false /* forceAttachToExistingConnection */,
-                false /* isConference */,
+                isDowngradedConference /* isConference */,
                 connection.getConnectTimeMillis() /* connectTimeMillis */);
 
         call.initAnalytics();