diff options
| author | Ihab Awad <ihab@google.com> | 2014-09-11 23:18:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-11 23:18:04 +0000 |
| commit | d27a3870f6a29efdd455b16261f8984ea42499e5 (patch) | |
| tree | 3a7122b3cfb37b23b770ecd888f55251734fd436 /api | |
| parent | fb008d6ac3326649e422945de0e62022a64c8a33 (diff) | |
| parent | 2ef34be665c778755e8c5512f13add0902964cae (diff) | |
| download | frameworks_base-d27a3870f6a29efdd455b16261f8984ea42499e5.zip frameworks_base-d27a3870f6a29efdd455b16261f8984ea42499e5.tar.gz frameworks_base-d27a3870f6a29efdd455b16261f8984ea42499e5.tar.bz2 | |
Merge "Change UI to represent conferenced IMS connections (1/3)" into lmp-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index 5037250..a7cfd0b 100644 --- a/api/current.txt +++ b/api/current.txt @@ -28375,12 +28375,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 } |