commit eb2d0aad5d36ae139036f344be230d57d5ae7ab8
author Hall Liu <hallliu@google.com> Mon Jul 18 17:44:38 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jul 18 17:44:40 2016 +0000
tree b79e53246bc8d355060d957d2d8c6c7fb6a8de10
parent 006c299b71047aaec0a26b33b80bd86ac8dedf68
parent 4b9e5566861568cf032db663b487c627d9a53772

Merge "Check for PROPERTY_IS_DOWNGRADED_CONFERENCE in addExistingConnection" into nyc-mr1-dev

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();