commit a29f4036a6dc2ba2acfabd223fe78581355cae06
author Andrew Lee <anwlee@google.com> Thu Aug 28 18:39:22 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 28 18:39:23 2014 +0000
tree da40921e5a21dfa94cb60ed470861f3b7b56a89e
parent 947c1922e7796ce04c508314b346dded8b36efa3
parent bfffd2d175cc0219e512f64ff47d1e9ba5a50aff

Merge "Use CallProperties on Telecomm Call." into lmp-dev

src/com/android/telecomm/InCallController.java

diff --git a/src/com/android/telecomm/InCallController.java b/src/com/android/telecomm/InCallController.java
index d2d4e9e..21581f5 100644
--- a/src/com/android/telecomm/InCallController.java
+++ b/src/com/android/telecomm/InCallController.java
@@ -31,6 +31,7 @@
 import android.os.RemoteException;
 import android.os.UserHandle;
 import android.telecomm.AudioState;
+import android.telecomm.CallProperties;
 import android.telecomm.CallState;
 import android.telecomm.InCallService;
 import android.telecomm.ParcelableCall;
@@ -431,6 +432,8 @@
             capabilities &= ~PhoneCapabilities.MUTE;
         }
 
+        int properties = call.isConference() ? CallProperties.CONFERENCE : 0;
+
         int state = call.getState();
         if (state == CallState.ABORTED) {
             state = CallState.DISCONNECTED;
@@ -478,6 +481,7 @@
                 call.getDisconnectMessage(),
                 call.getCannedSmsResponses(),
                 capabilities,
+                properties,
                 connectTimeMillis,
                 handle,
                 call.getHandlePresentation(),