commit 95ac44451d432cbbb3908efed490e90a803edf22
author Andrew Lee <anwlee@google.com> Wed Apr 15 13:00:42 2015 -0700
committer Andrew Lee <anwlee@google.com> Wed Apr 15 13:00:42 2015 -0700
tree 2901c9f0c2670d9763ccaf20d99ef8a09c942eb1
parent 90a319c06e77b369849b14f2bc3da99f4a81230e

DO NOT MERGE Suffix VT_LOCAL/VT_REMOTE with BIDIRECTIONAL.

Bug: 20160395
Change-Id: Id109cf1ee5206fc4a6d445716b6e5c8e20930b1c

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 17e9e37..4c44bd7 100644
--- a/src/com/android/server/telecom/InCallController.java
+++ b/src/com/android/server/telecom/InCallController.java
@@ -485,10 +485,10 @@
         }
 
         if (state == CallState.DIALING) {
-            capabilities = removeCapability(
-                    capabilities, android.telecom.Call.Details.CAPABILITY_SUPPORTS_VT_LOCAL);
-            capabilities = removeCapability(
-                    capabilities, android.telecom.Call.Details.CAPABILITY_SUPPORTS_VT_REMOTE);
+            capabilities = removeCapability(capabilities,
+                    android.telecom.Call.Details.CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL);
+            capabilities = removeCapability(capabilities,
+                    android.telecom.Call.Details.CAPABILITY_SUPPORTS_VT_REMOTE_BIDIRECTIONAL);
         }
 
         if (state == CallState.ABORTED) {
@@ -593,8 +593,8 @@
         Connection.CAPABILITY_SUPPORTS_VT_LOCAL_TX,
         android.telecom.Call.Details.CAPABILITY_SUPPORTS_VT_LOCAL_TX,
 
-        Connection.CAPABILITY_SUPPORTS_VT_LOCAL,
-        android.telecom.Call.Details.CAPABILITY_SUPPORTS_VT_LOCAL,
+        Connection.CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL,
+        android.telecom.Call.Details.CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL,
 
         Connection.CAPABILITY_SUPPORTS_VT_REMOTE_RX,
         android.telecom.Call.Details.CAPABILITY_SUPPORTS_VT_REMOTE_RX,
@@ -602,8 +602,8 @@
         Connection.CAPABILITY_SUPPORTS_VT_REMOTE_TX,
         android.telecom.Call.Details.CAPABILITY_SUPPORTS_VT_REMOTE_TX,
 
-        Connection.CAPABILITY_SUPPORTS_VT_REMOTE,
-        android.telecom.Call.Details.CAPABILITY_SUPPORTS_VT_REMOTE,
+        Connection.CAPABILITY_SUPPORTS_VT_REMOTE_BIDIRECTIONAL,
+        android.telecom.Call.Details.CAPABILITY_SUPPORTS_VT_REMOTE_BIDIRECTIONAL,
 
         Connection.CAPABILITY_HIGH_DEF_AUDIO,
         android.telecom.Call.Details.CAPABILITY_HIGH_DEF_AUDIO,

testapps/src/com/android/server/telecom/testapps/TestConnectionService.java

diff --git a/testapps/src/com/android/server/telecom/testapps/TestConnectionService.java b/testapps/src/com/android/server/telecom/testapps/TestConnectionService.java
index 23df055..7efdb8a 100644
--- a/testapps/src/com/android/server/telecom/testapps/TestConnectionService.java
+++ b/testapps/src/com/android/server/telecom/testapps/TestConnectionService.java
@@ -157,8 +157,8 @@
             mIsIncoming = isIncoming;
             // Assume all calls are video capable.
             int capabilities = getConnectionCapabilities();
-            capabilities |= CAPABILITY_SUPPORTS_VT_LOCAL;
-            capabilities |= CAPABILITY_SUPPORTS_VT_REMOTE;
+            capabilities |= CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL;
+            capabilities |= CAPABILITY_SUPPORTS_VT_REMOTE_BIDIRECTIONAL;
             capabilities |= CAPABILITY_CAN_UPGRADE_TO_VIDEO;
             capabilities |= CAPABILITY_MUTE;
             capabilities |= CAPABILITY_SUPPORT_HOLD;