summaryrefslogtreecommitdiffstats
path: root/telecomm/java
diff options
context:
space:
mode:
authorAndrew Lee <anwlee@google.com>2014-11-18 16:19:17 -0800
committerAndrew Lee <anwlee@google.com>2014-11-18 17:26:07 -0800
commit49e213cd7de1d6ff4f7bb27caafd57971bd0a734 (patch)
tree846b71637b85ac9ebecce31da5c493402067e317 /telecomm/java
parentf984eb42724e66326549d7bf33a7ec1515a7ff3c (diff)
downloadframeworks_base-49e213cd7de1d6ff4f7bb27caafd57971bd0a734.zip
frameworks_base-49e213cd7de1d6ff4f7bb27caafd57971bd0a734.tar.gz
frameworks_base-49e213cd7de1d6ff4f7bb27caafd57971bd0a734.tar.bz2
Add GENERIC_CONFERENCE to phone capabilities.
This is a temporary capability to recognize CDMA conference calls so we can show the right strings in the InCallUi. This should be moved to CallProperties when possible. b/18434985 Bug: 18284408 Change-Id: Ia3e2ff91c8f8a91ff0123df4d3e6a581bdf85895
Diffstat (limited to 'telecomm/java')
-rw-r--r--telecomm/java/android/telecom/PhoneCapabilities.java14
1 files changed, 14 insertions, 0 deletions
diff --git a/telecomm/java/android/telecom/PhoneCapabilities.java b/telecomm/java/android/telecom/PhoneCapabilities.java
index feb7a95..c21a6d1 100644
--- a/telecomm/java/android/telecom/PhoneCapabilities.java
+++ b/telecomm/java/android/telecom/PhoneCapabilities.java
@@ -101,6 +101,16 @@ public final class PhoneCapabilities {
*/
public static final int DISCONNECT_FROM_CONFERENCE = 0x00002000;
+ /**
+ * Whether the call is a generic conference, where we do not know the precise state of
+ * participants in the conference (eg. on CDMA).
+ *
+ * TODO: Move to CallProperties.
+ *
+ * @hide
+ */
+ public static final int GENERIC_CONFERENCE = 0x00004000;
+
public static final int ALL = HOLD | SUPPORT_HOLD | MERGE_CONFERENCE | SWAP_CONFERENCE
| RESPOND_VIA_TEXT | MUTE | MANAGE_CONFERENCE | SEPARATE_FROM_CONFERENCE
| DISCONNECT_FROM_CONFERENCE;
@@ -163,6 +173,10 @@ public final class PhoneCapabilities {
if (can(capabilities, VoWIFI)) {
builder.append(" VoWIFI");
}
+ if (can(capabilities, GENERIC_CONFERENCE)) {
+ builder.append(" GENERIC_CONFERENCE");
+ }
+
builder.append("]");
return builder.toString();
}