Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am e6a1e993: Merge "Add GENERIC_CONFERENCE to phone capabilities." into lmp-mr1-dev

Browse Source 
* commit 'e6a1e993c2e3663ee60085b66fe8697d5de6e268':
  Add GENERIC_CONFERENCE to phone capabilities.
This commit is contained in:
Andrew Lee
2014-11-19 19:06:32 +00:00
committed by Android Git Automerger
parent 29db396ea9 e6a1e993c2
commit 3f4244773d
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
telecomm/java/android/telecom/PhoneCapabilities.java
View File

@@ -101,6 +101,16 @@ public final class PhoneCapabilities {
*/ */
public static final int DISCONNECT_FROM_CONFERENCE = 0x00002000; 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 public static final int ALL = HOLD | SUPPORT_HOLD | MERGE_CONFERENCE | SWAP_CONFERENCE
| RESPOND_VIA_TEXT | MUTE | MANAGE_CONFERENCE | SEPARATE_FROM_CONFERENCE | RESPOND_VIA_TEXT | MUTE | MANAGE_CONFERENCE | SEPARATE_FROM_CONFERENCE
| DISCONNECT_FROM_CONFERENCE; | DISCONNECT_FROM_CONFERENCE;
@@ -163,6 +173,10 @@ public final class PhoneCapabilities {
if (can(capabilities, VoWIFI)) { if (can(capabilities, VoWIFI)) {
builder.append(" VoWIFI"); builder.append(" VoWIFI");
} }
if (can(capabilities, GENERIC_CONFERENCE)) {
builder.append(" GENERIC_CONFERENCE");
}
builder.append("]"); builder.append("]");
return builder.toString(); return builder.toString();
} }