diff options
| author | RoboErik <epastern@google.com> | 2014-05-07 17:29:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-07 17:29:57 +0000 |
| commit | 49817456ab7da963b7c598d60a1713fd26907266 (patch) | |
| tree | e29e135be410c286dbab839af44140e1fa57043f /api | |
| parent | f8896f187d06db91c9b948cc6e8d3eb1f19cd2a4 (diff) | |
| parent | 780bee263359b1462156f543a04fab98dd541845 (diff) | |
| download | frameworks_base-49817456ab7da963b7c598d60a1713fd26907266.zip frameworks_base-49817456ab7da963b7c598d60a1713fd26907266.tar.gz frameworks_base-49817456ab7da963b7c598d60a1713fd26907266.tar.bz2 | |
am 13ca0e29: Merge "Add APIs for creating a system priority session and getting controllers"
* commit '13ca0e29030721f380082bc937f3b1c40d3fc318':
Add APIs for creating a system priority session and getting controllers
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index da992be..1d7b795 100644 --- a/api/current.txt +++ b/api/current.txt @@ -15519,7 +15519,7 @@ package android.media.session { public final class SessionManager { method public android.media.session.Session createSession(java.lang.String); - method public java.util.List<android.media.session.SessionController> getActiveSessions(); + method public java.util.List<android.media.session.SessionController> getActiveSessions(android.content.ComponentName); } public class SessionToken implements android.os.Parcelable { |