diff options
| author | Andrew Lee <anwlee@google.com> | 2015-04-11 21:17:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-11 21:17:26 +0000 |
| commit | 8581b67e6c93fbc913bf0cab9e903617d0e07f0f (patch) | |
| tree | 6aa98cc3b00e6fae3167c8ff38ee44d2bffce410 /telecomm/java/android/telecom | |
| parent | cf60d9f581cd510f2f9f6e8448fac8db87ba3eb0 (diff) | |
| parent | 9a8f9ce7adeb5fd93c11afffcc580d2af5c1225d (diff) | |
| download | frameworks_base-8581b67e6c93fbc913bf0cab9e903617d0e07f0f.zip frameworks_base-8581b67e6c93fbc913bf0cab9e903617d0e07f0f.tar.gz frameworks_base-8581b67e6c93fbc913bf0cab9e903617d0e07f0f.tar.bz2 | |
Merge "Suffix VT_LOCAL and VT_REMOTE with BIDIRECTIONAL."
Diffstat (limited to 'telecomm/java/android/telecom')
| -rw-r--r-- | telecomm/java/android/telecom/Call.java | 12 | ||||
| -rw-r--r-- | telecomm/java/android/telecom/Connection.java | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/telecomm/java/android/telecom/Call.java b/telecomm/java/android/telecom/Call.java index 6fa653d..d682cdc 100644 --- a/telecomm/java/android/telecom/Call.java +++ b/telecomm/java/android/telecom/Call.java @@ -156,7 +156,7 @@ public final class Call { * Local device supports bidirectional video calling. * @hide */ - public static final int CAPABILITY_SUPPORTS_VT_LOCAL = + public static final int CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL = CAPABILITY_SUPPORTS_VT_LOCAL_RX | CAPABILITY_SUPPORTS_VT_LOCAL_TX; /** @@ -175,7 +175,7 @@ public final class Call { * Remote device supports bidirectional video calling. * @hide */ - public static final int CAPABILITY_SUPPORTS_VT_REMOTE = + public static final int CAPABILITY_SUPPORTS_VT_REMOTE_BIDIRECTIONAL = CAPABILITY_SUPPORTS_VT_REMOTE_RX | CAPABILITY_SUPPORTS_VT_REMOTE_TX; /** @@ -298,8 +298,8 @@ public final class Call { if (can(capabilities, CAPABILITY_SUPPORTS_VT_LOCAL_TX)) { builder.append(" CAPABILITY_SUPPORTS_VT_LOCAL_TX"); } - if (can(capabilities, CAPABILITY_SUPPORTS_VT_LOCAL)) { - builder.append(" CAPABILITY_SUPPORTS_VT_LOCAL"); + if (can(capabilities, CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL)) { + builder.append(" CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL"); } if (can(capabilities, CAPABILITY_SUPPORTS_VT_REMOTE_RX)) { builder.append(" CAPABILITY_SUPPORTS_VT_REMOTE_RX"); @@ -307,8 +307,8 @@ public final class Call { if (can(capabilities, CAPABILITY_SUPPORTS_VT_REMOTE_TX)) { builder.append(" CAPABILITY_SUPPORTS_VT_REMOTE_TX"); } - if (can(capabilities, CAPABILITY_SUPPORTS_VT_REMOTE)) { - builder.append(" CAPABILITY_SUPPORTS_VT_REMOTE"); + if (can(capabilities, CAPABILITY_SUPPORTS_VT_REMOTE_BIDIRECTIONAL)) { + builder.append(" CAPABILITY_SUPPORTS_VT_REMOTE_BIDIRECTIONAL"); } if (can(capabilities, CAPABILITY_HIGH_DEF_AUDIO)) { builder.append(" CAPABILITY_HIGH_DEF_AUDIO"); diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java index 082474b..e2f4de6 100644 --- a/telecomm/java/android/telecom/Connection.java +++ b/telecomm/java/android/telecom/Connection.java @@ -121,7 +121,7 @@ public abstract class Connection implements IConferenceable { * Local device supports bidirectional video calling. * @hide */ - public static final int CAPABILITY_SUPPORTS_VT_LOCAL = + public static final int CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL = CAPABILITY_SUPPORTS_VT_LOCAL_RX | CAPABILITY_SUPPORTS_VT_LOCAL_TX; /** @@ -140,7 +140,7 @@ public abstract class Connection implements IConferenceable { * Remote device supports bidirectional video calling. * @hide */ - public static final int CAPABILITY_SUPPORTS_VT_REMOTE = + public static final int CAPABILITY_SUPPORTS_VT_REMOTE_BIDIRECTIONAL = CAPABILITY_SUPPORTS_VT_REMOTE_RX | CAPABILITY_SUPPORTS_VT_REMOTE_TX; /** @@ -267,8 +267,8 @@ public abstract class Connection implements IConferenceable { if (can(capabilities, CAPABILITY_SUPPORTS_VT_LOCAL_TX)) { builder.append(" CAPABILITY_SUPPORTS_VT_LOCAL_TX"); } - if (can(capabilities, CAPABILITY_SUPPORTS_VT_LOCAL)) { - builder.append(" CAPABILITY_SUPPORTS_VT_LOCAL"); + if (can(capabilities, CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL)) { + builder.append(" CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL"); } if (can(capabilities, CAPABILITY_SUPPORTS_VT_REMOTE_RX)) { builder.append(" CAPABILITY_SUPPORTS_VT_REMOTE_RX"); @@ -276,8 +276,8 @@ public abstract class Connection implements IConferenceable { if (can(capabilities, CAPABILITY_SUPPORTS_VT_REMOTE_TX)) { builder.append(" CAPABILITY_SUPPORTS_VT_REMOTE_TX"); } - if (can(capabilities, CAPABILITY_SUPPORTS_VT_REMOTE)) { - builder.append(" CAPABILITY_SUPPORTS_VT_REMOTE"); + if (can(capabilities, CAPABILITY_SUPPORTS_VT_REMOTE_BIDIRECTIONAL)) { + builder.append(" CAPABILITY_SUPPORTS_VT_REMOTE_BIDIRECTIONAL"); } if (can(capabilities, CAPABILITY_HIGH_DEF_AUDIO)) { builder.append(" CAPABILITY_HIGH_DEF_AUDIO"); |