summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorNancy Chen <nancychen@google.com>2014-09-19 19:32:31 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-19 19:32:31 +0000
commita82dcedd308e692dcd679a9f53a4642c26a55d3a (patch)
tree24baa4455889754a949f611ad68052470d8953a4 /api
parent86213788f8b1ef8fdac6847adb0195a92a1e0257 (diff)
parent3fab08eef6b5db79d229c8538ebbb3be5037da95 (diff)
downloadframeworks_base-a82dcedd308e692dcd679a9f53a4642c26a55d3a.zip
frameworks_base-a82dcedd308e692dcd679a9f53a4642c26a55d3a.tar.gz
frameworks_base-a82dcedd308e692dcd679a9f53a4642c26a55d3a.tar.bz2
am 6f271251: Merge "Add constructor for DisconnectCause that does not require a tone." into lmp-dev
* commit '6f2712513c83a2f13bf6376182edabbf022da890': Add constructor for DisconnectCause that does not require a tone.
Diffstat (limited to 'api')
-rw-r--r--api/current.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 9589d10..f74c705 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -28174,6 +28174,7 @@ package android.telecom {
public final class DisconnectCause implements android.os.Parcelable {
ctor public DisconnectCause(int);
ctor public DisconnectCause(int, java.lang.String);
+ ctor public DisconnectCause(int, java.lang.CharSequence, java.lang.CharSequence, java.lang.String);
ctor public DisconnectCause(int, java.lang.CharSequence, java.lang.CharSequence, java.lang.String, int);
method public int describeContents();
method public int getCode();