commit fa62861fd01cf5fc39de73a231eb30ef5c70c02e
author Linux Build Service Account <lnxbuild@localhost> Sat Apr 04 08:48:44 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sat Apr 04 08:48:44 2015 -0700
tree e4753b01d98d1e415442cf2fb70107e2f9d00907
parent d09a6ac05526c594d6e98ae8c3e51b0fe47963a2
parent c03c6db84ac15909b5995d8d6f22bac5fd0c2df8

Merge "Revert "Subscription selection when dialing USSD""

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 c85c5c9..b406db5 100755
--- a/src/com/android/server/telecom/InCallController.java
+++ b/src/com/android/server/telecom/InCallController.java
@@ -618,6 +618,9 @@
 
         Connection.ADD_PARTICIPANT,
         android.telecom.Call.Details.ADD_PARTICIPANT,
+
+        Connection.CAPABILITY_GENERIC_CONFERENCE,
+        android.telecom.Call.Details.CAPABILITY_GENERIC_CONFERENCE
     };
 
     private static int convertConnectionToCallCapabilities(int connectionCapabilities) {