commit bfffd2d175cc0219e512f64ff47d1e9ba5a50aff
author Andrew Lee <anwlee@google.com> Wed Aug 27 16:28:31 2014 -0700
committer Andrew Lee <anwlee@google.com> Wed Aug 27 16:47:41 2014 -0700
tree 1101c4594cf83563b7b4297e5ca00ce7eb6e69cb
parent 65c6f3f69994b24f46f38f60472fc794b0f55021

Use CallProperties on Telecomm Call.

Bug: 17304243
Change-Id: I96ed599e77c619cff7d24b214969a5d449bcc9a3

src/com/android/telecomm/InCallController.java

diff --git a/src/com/android/telecomm/InCallController.java b/src/com/android/telecomm/InCallController.java
index 2e7bc45..0aa53df 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;
@@ -429,6 +430,8 @@
             capabilities |= PhoneCapabilities.MUTE;
         }
 
+        int properties = call.isConference() ? CallProperties.CONFERENCE : 0;
+
         int state = call.getState();
         if (state == CallState.ABORTED) {
             state = CallState.DISCONNECTED;
@@ -476,6 +479,7 @@
                 call.getDisconnectMessage(),
                 call.getCannedSmsResponses(),
                 capabilities,
+                properties,
                 connectTimeMillis,
                 handle,
                 call.getHandlePresentation(),