am c3c238a3: Merge "Properly convert GENERIC_CONFERENCE capabilities." into lmp-mr1-dev
* commit 'c3c238a3e3b3de9ced4d632182027b4af6ee7656':
Properly convert GENERIC_CONFERENCE capabilities.
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) {