diff options
7 files changed, 24 insertions, 24 deletions
diff --git a/api/current.txt b/api/current.txt index 703d6bd..3bd7fc4 100644 --- a/api/current.txt +++ b/api/current.txt @@ -16376,8 +16376,6 @@ package android.media.session { public final class MediaController { ctor public MediaController(android.content.Context, android.media.session.MediaSession.Token); - method public void addCallback(android.media.session.MediaController.Callback); - method public void addCallback(android.media.session.MediaController.Callback, android.os.Handler); method public void adjustVolume(int, int); method public boolean dispatchMediaButtonEvent(android.view.KeyEvent); method public android.os.Bundle getExtras(); @@ -16392,9 +16390,11 @@ package android.media.session { method public android.app.PendingIntent getSessionActivity(); method public android.media.session.MediaSession.Token getSessionToken(); method public android.media.session.MediaController.TransportControls getTransportControls(); - method public void removeCallback(android.media.session.MediaController.Callback); + method public void registerCallback(android.media.session.MediaController.Callback); + method public void registerCallback(android.media.session.MediaController.Callback, android.os.Handler); method public void sendCommand(java.lang.String, android.os.Bundle, android.os.ResultReceiver); method public void setVolumeTo(int, int); + method public void unregisterCallback(android.media.session.MediaController.Callback); } public static abstract class MediaController.Callback { diff --git a/media/java/android/media/RemoteController.java b/media/java/android/media/RemoteController.java index fbfac89..d84cf30 100644 --- a/media/java/android/media/RemoteController.java +++ b/media/java/android/media/RemoteController.java @@ -980,7 +980,7 @@ import java.util.List; synchronized (mInfoLock) { if (controller == null) { if (mCurrentSession != null) { - mCurrentSession.removeCallback(mSessionCb); + mCurrentSession.unregisterCallback(mSessionCb); mCurrentSession = null; sendMsg(mEventHandler, MSG_CLIENT_CHANGE, SENDMSG_REPLACE, 0 /* genId */, 1 /* clearing */, null /* obj */, 0 /* delay */); @@ -989,12 +989,12 @@ import java.util.List; || !controller.getSessionToken() .equals(mCurrentSession.getSessionToken())) { if (mCurrentSession != null) { - mCurrentSession.removeCallback(mSessionCb); + mCurrentSession.unregisterCallback(mSessionCb); } sendMsg(mEventHandler, MSG_CLIENT_CHANGE, SENDMSG_REPLACE, 0 /* genId */, 0 /* clearing */, null /* obj */, 0 /* delay */); mCurrentSession = controller; - mCurrentSession.addCallback(mSessionCb, mEventHandler); + mCurrentSession.registerCallback(mSessionCb, mEventHandler); PlaybackState state = controller.getPlaybackState(); sendMsg(mEventHandler, MSG_NEW_PLAYBACK_STATE, SENDMSG_REPLACE, diff --git a/media/java/android/media/session/MediaController.java b/media/java/android/media/session/MediaController.java index 4d4d646..be86741 100644 --- a/media/java/android/media/session/MediaController.java +++ b/media/java/android/media/session/MediaController.java @@ -329,24 +329,24 @@ public final class MediaController { } /** - * Adds a callback to receive updates from the Session. Updates will be + * Registers a callback to receive updates from the Session. Updates will be * posted on the caller's thread. * * @param callback The callback object, must not be null. */ - public void addCallback(@NonNull Callback callback) { - addCallback(callback, null); + public void registerCallback(@NonNull Callback callback) { + registerCallback(callback, null); } /** - * Adds a callback to receive updates from the session. Updates will be + * Registers a callback to receive updates from the session. Updates will be * posted on the specified handler's thread. * * @param callback The callback object, must not be null. * @param handler The handler to post updates on. If null the callers thread * will be used. */ - public void addCallback(@NonNull Callback callback, @Nullable Handler handler) { + public void registerCallback(@NonNull Callback callback, @Nullable Handler handler) { if (callback == null) { throw new IllegalArgumentException("callback must not be null"); } @@ -359,12 +359,12 @@ public final class MediaController { } /** - * Stop receiving updates on the specified callback. If an update has - * already been posted you may still receive it after calling this method. + * Unregisters the specified callback. If an update has already been posted + * you may still receive it after calling this method. * * @param callback The callback to remove. */ - public void removeCallback(@NonNull Callback callback) { + public void unregisterCallback(@NonNull Callback callback) { if (callback == null) { throw new IllegalArgumentException("callback must not be null"); } @@ -495,7 +495,7 @@ public final class MediaController { /** * Callback for receiving updates on from the session. A Callback can be - * registered using {@link #addCallback} + * registered using {@link #registerCallback} */ public static abstract class Callback { /** diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java index ddd03d6..e10893c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -1730,12 +1730,12 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, // something old was playing Log.v(TAG, "DEBUG_MEDIA: Disconnecting from old controller: " + mMediaController); - mMediaController.removeCallback(mMediaListener); + mMediaController.unregisterCallback(mMediaListener); } mMediaController = controller; if (mMediaController != null) { - mMediaController.addCallback(mMediaListener); + mMediaController.registerCallback(mMediaListener); mMediaMetadata = mMediaController.getMetadata(); if (DEBUG_MEDIA) { Log.v(TAG, "DEBUG_MEDIA: insert listener, receive metadata: " diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java b/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java index 5da8681..ffc10a9 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java @@ -1055,11 +1055,11 @@ public class VolumePanel extends Handler { if (sc != null) { if (streamType == STREAM_REMOTE_MUSIC && controller != sc.controller) { if (sc.controller != null) { - sc.controller.removeCallback(mMediaControllerCb); + sc.controller.unregisterCallback(mMediaControllerCb); } sc.controller = controller; if (controller != null) { - sc.controller.addCallback(mMediaControllerCb); + sc.controller.registerCallback(mMediaControllerCb); } } if (sc.seekbarView.getMax() != max) { @@ -1175,7 +1175,7 @@ public class VolumePanel extends Handler { StreamControl sc = mStreamControls.get(STREAM_REMOTE_MUSIC); if (sc != null) { if (sc.controller != null) { - sc.controller.removeCallback(mMediaControllerCb); + sc.controller.unregisterCallback(mMediaControllerCb); sc.controller = null; } } diff --git a/tests/OneMedia/src/com/android/onemedia/NotificationHelper.java b/tests/OneMedia/src/com/android/onemedia/NotificationHelper.java index d1172ac..ceb0937 100644 --- a/tests/OneMedia/src/com/android/onemedia/NotificationHelper.java +++ b/tests/OneMedia/src/com/android/onemedia/NotificationHelper.java @@ -76,7 +76,7 @@ public class NotificationHelper extends BroadcastReceiver { * destroyed before {@link #onStop} is called. */ public void onStart() { - mController.addCallback(mCb); + mController.registerCallback(mCb); IntentFilter filter = new IntentFilter(); filter.addAction(RequestUtils.ACTION_FFWD); filter.addAction(RequestUtils.ACTION_NEXT); @@ -100,7 +100,7 @@ public class NotificationHelper extends BroadcastReceiver { */ public void onStop() { mStarted = false; - mController.removeCallback(mCb); + mController.unregisterCallback(mCb); mService.unregisterReceiver(this); updateNotification(); } diff --git a/tests/OneMedia/src/com/android/onemedia/PlayerController.java b/tests/OneMedia/src/com/android/onemedia/PlayerController.java index c8d72ca..7861bcc 100644 --- a/tests/OneMedia/src/com/android/onemedia/PlayerController.java +++ b/tests/OneMedia/src/com/android/onemedia/PlayerController.java @@ -159,7 +159,7 @@ public class PlayerController { @Override public void onServiceDisconnected(ComponentName name) { if (mController != null) { - mController.removeCallback(mControllerCb); + mController.unregisterCallback(mControllerCb); } mBinder = null; mController = null; @@ -185,7 +185,7 @@ public class PlayerController { } mController = new MediaController(mContext, token); mContext.setMediaController(mController); - mController.addCallback(mControllerCb, mHandler); + mController.registerCallback(mControllerCb, mHandler); mTransportControls = mController.getTransportControls(); if (mArt != null) { setArt(mArt); |