diff options
| author | Santos Cordon <santoscordon@google.com> | 2015-04-24 00:06:49 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-24 00:07:02 +0000 |
| commit | 3a860a3fda3d74777887e507bdddfca1c4369e6c (patch) | |
| tree | 7bd65d536c812f29e8dad0a2088b482774d8d7bb /system-api | |
| parent | 3b0a1681da446c468587974fd5f2398c25332479 (diff) | |
| parent | 0f68464f84adfc401dd7eba9ee4b0a3799d17673 (diff) | |
| download | prebuilts_sdk-3a860a3fda3d74777887e507bdddfca1c4369e6c.zip prebuilts_sdk-3a860a3fda3d74777887e507bdddfca1c4369e6c.tar.gz prebuilts_sdk-3a860a3fda3d74777887e507bdddfca1c4369e6c.tar.bz2 | |
Merge "update PRE_DIAL_WAIT in old system API"
Diffstat (limited to 'system-api')
| -rw-r--r-- | system-api/23.txt | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/system-api/23.txt b/system-api/23.txt index 9c47186..cfceba5 100644 --- a/system-api/23.txt +++ b/system-api/23.txt @@ -29844,8 +29844,9 @@ package android.telecom { field public static final int STATE_DISCONNECTING = 10; // 0xa field public static final int STATE_HOLDING = 3; // 0x3 field public static final int STATE_NEW = 0; // 0x0 - field public static final int STATE_PRE_DIAL_WAIT = 8; // 0x8 + field public static final deprecated int STATE_PRE_DIAL_WAIT = 8; // 0x8 field public static final int STATE_RINGING = 2; // 0x2 + field public static final int STATE_SELECT_PHONE_ACCOUNT = 8; // 0x8 } public static class Call.Details { @@ -29886,20 +29887,6 @@ package android.telecom { method public void onStateChanged(android.telecom.Call, int); } - public final class CallState { - method public static java.lang.String toString(int); - field public static final int ABORTED = 8; // 0x8 - field public static final int ACTIVE = 5; // 0x5 - field public static final int CONNECTING = 1; // 0x1 - field public static final int DIALING = 3; // 0x3 - field public static final int DISCONNECTED = 7; // 0x7 - field public static final int DISCONNECTING = 9; // 0x9 - field public static final int NEW = 0; // 0x0 - field public static final int ON_HOLD = 6; // 0x6 - field public static final int PRE_DIAL_WAIT = 2; // 0x2 - field public static final int RINGING = 4; // 0x4 - } - public abstract class Conference implements android.telecom.Conferenceable { ctor public Conference(android.telecom.PhoneAccountHandle); method public final boolean addConnection(android.telecom.Connection); |