diff options
| author | Ben Gilad <gilad@google.com> | 2014-03-06 21:51:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-06 21:51:23 +0000 |
| commit | 45b5cf0f6ea5769f5341b6070fde73e9546b06b6 (patch) | |
| tree | 7c5dd8724bc41d1b4bb8cce88f2ae7fb8f7b519e /api | |
| parent | 14689c991398b190ed11ecfb13945ae8e4f82be3 (diff) | |
| parent | 3fadaa923272675d841eda3d46b3e1d9dc08c819 (diff) | |
| download | frameworks_base-45b5cf0f6ea5769f5341b6070fde73e9546b06b6.zip frameworks_base-45b5cf0f6ea5769f5341b6070fde73e9546b06b6.tar.gz frameworks_base-45b5cf0f6ea5769f5341b6070fde73e9546b06b6.tar.bz2 | |
Merge "Add the abort API to ICallService implementations." into master-nova
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index 456c7f1..3f16796 100644 --- a/api/current.txt +++ b/api/current.txt @@ -24259,6 +24259,7 @@ package android.telecomm { public abstract class CallService extends android.app.Service { ctor public CallService(); + method public abstract void abort(java.lang.String); method public abstract void answer(java.lang.String); method public abstract void call(android.telecomm.CallInfo); method public abstract void disconnect(java.lang.String); @@ -24313,7 +24314,6 @@ package android.telecomm { public final class CallState extends java.lang.Enum { method public static android.telecomm.CallState valueOf(java.lang.String); method public static final android.telecomm.CallState[] values(); - enum_constant public static final android.telecomm.CallState ABORTED; enum_constant public static final android.telecomm.CallState ACTIVE; enum_constant public static final android.telecomm.CallState DIALING; enum_constant public static final android.telecomm.CallState DISCONNECTED; @@ -24321,6 +24321,7 @@ package android.telecomm { } public abstract interface ICallService implements android.os.IInterface { + method public abstract void abort(java.lang.String) throws android.os.RemoteException; method public abstract void answer(java.lang.String) throws android.os.RemoteException; method public abstract void call(android.telecomm.CallInfo) throws android.os.RemoteException; method public abstract void disconnect(java.lang.String) throws android.os.RemoteException; |