diff options
| author | RoboErik <epastern@google.com> | 2014-05-15 23:08:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-15 23:08:26 +0000 |
| commit | 7e89723bb4204537ede2058b61b94c4e99444c03 (patch) | |
| tree | 38796b8cee55e82974fba646971c739e1b7394e9 /api | |
| parent | bc3376f1c28ebd03765127cb8351008ddb62fc19 (diff) | |
| parent | 4646d288821d62fdfe481be67d8b7fed7d7eabd8 (diff) | |
| download | frameworks_base-7e89723bb4204537ede2058b61b94c4e99444c03.zip frameworks_base-7e89723bb4204537ede2058b61b94c4e99444c03.tar.gz frameworks_base-7e89723bb4204537ede2058b61b94c4e99444c03.tar.bz2 | |
Merge "Add UserRecords to separate user interactions"
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index 8cf30d7..b0b8a37 100644 --- a/api/current.txt +++ b/api/current.txt @@ -15573,7 +15573,7 @@ package android.media.session { method public void addCallback(android.media.session.Session.Callback); method public void addCallback(android.media.session.Session.Callback, android.os.Handler); method public void connect(android.media.session.RouteInfo, android.media.session.RouteOptions); - method public void disconnect(android.media.session.RouteInfo); + method public void disconnect(); method public android.media.session.SessionToken getSessionToken(); method public android.media.session.TransportPerformer getTransportPerformer(); method public boolean isActive(); @@ -15583,6 +15583,11 @@ package android.media.session { method public void setActive(boolean); method public void setFlags(int); method public void setRouteOptions(java.util.List<android.media.session.RouteOptions>); + field public static final int DISCONNECT_REASON_PROVIDER_DISCONNECTED = 2; // 0x2 + field public static final int DISCONNECT_REASON_ROUTE_CHANGED = 3; // 0x3 + field public static final int DISCONNECT_REASON_SESSION_DESTROYED = 5; // 0x5 + field public static final int DISCONNECT_REASON_SESSION_DISCONNECTED = 4; // 0x4 + field public static final int DISCONNECT_REASON_USER_STOPPING = 1; // 0x1 field public static final int FLAG_HANDLES_MEDIA_BUTTONS = 1; // 0x1 field public static final int FLAG_HANDLES_TRANSPORT_CONTROLS = 2; // 0x2 } |