commit 976fea98681dd6622685a4f7887aec3c05b5921b
author Andrew Lee <anwlee@google.com> Tue Dec 02 23:04:41 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Dec 02 23:04:41 2014 +0000
tree 7740ac7d8b06cfd0d8cb0a15c2ad8e978ae2f565
parent ffce0588381e33bac66ab9044d1c9b7610ee801c
parent c3c238a3e3b3de9ced4d632182027b4af6ee7656

am c3c238a3: Merge "Properly convert GENERIC_CONFERENCE capabilities." into lmp-mr1-dev

* commit 'c3c238a3e3b3de9ced4d632182027b4af6ee7656':
  Properly convert GENERIC_CONFERENCE capabilities.

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

diff --git a/src/com/android/server/telecom/InCallController.java b/src/com/android/server/telecom/InCallController.java
index bc0e315..3b4af57 100644
--- a/src/com/android/server/telecom/InCallController.java
+++ b/src/com/android/server/telecom/InCallController.java
@@ -582,6 +582,9 @@
 
         Connection.CAPABILITY_DISCONNECT_FROM_CONFERENCE,
         android.telecom.Call.Details.CAPABILITY_DISCONNECT_FROM_CONFERENCE,
+
+        Connection.CAPABILITY_GENERIC_CONFERENCE,
+        android.telecom.Call.Details.CAPABILITY_GENERIC_CONFERENCE
     };
 
     private static int convertConnectionToCallCapabilities(int connectionCapabilities) {