summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorIhab Awad <ihab@google.com>2014-09-11 08:49:02 -0700
committerIhab Awad <ihab@google.com>2014-09-11 15:02:39 -0700
commit2ef34be665c778755e8c5512f13add0902964cae (patch)
tree855715ec2a129f47b2a7ee7781d18d1fd9de23e8 /api
parentdb352c783575afee2d6bc29baf45c83d5fc421cf (diff)
downloadframeworks_base-2ef34be665c778755e8c5512f13add0902964cae.zip
frameworks_base-2ef34be665c778755e8c5512f13add0902964cae.tar.gz
frameworks_base-2ef34be665c778755e8c5512f13add0902964cae.tar.bz2
Change UI to represent conferenced IMS connections (1/3)
IMS conferenced connnections cannot individually hold or disconnect. Bug: 17451623 Change-Id: Ie945d2c23f752f5403d01668606fe893dca0a882
Diffstat (limited to 'api')
-rw-r--r--api/current.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt
index 82aad79..66ba623 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -28377,12 +28377,14 @@ package android.telecomm {
public final class PhoneCapabilities {
method public static java.lang.String toString(int);
field public static final int ADD_CALL = 16; // 0x10
- field public static final int ALL = 255; // 0xff
+ field public static final int ALL = 12543; // 0x30ff
+ field public static final int DISCONNECT_FROM_CONFERENCE = 8192; // 0x2000
field public static final int HOLD = 1; // 0x1
field public static final int MANAGE_CONFERENCE = 128; // 0x80
field public static final int MERGE_CONFERENCE = 4; // 0x4
field public static final int MUTE = 64; // 0x40
field public static final int RESPOND_VIA_TEXT = 32; // 0x20
+ field public static final int SEPARATE_FROM_CONFERENCE = 4096; // 0x1000
field public static final int SUPPORT_HOLD = 2; // 0x2
field public static final int SWAP_CONFERENCE = 8; // 0x8
}