From 49e213cd7de1d6ff4f7bb27caafd57971bd0a734 Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Tue, 18 Nov 2014 16:19:17 -0800 Subject: [PATCH] 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 --- .../java/android/telecom/PhoneCapabilities.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/telecomm/java/android/telecom/PhoneCapabilities.java b/telecomm/java/android/telecom/PhoneCapabilities.java index feb7a953a993e..c21a6d13750a6 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(); }