diff options
| author | RoboErik <epastern@google.com> | 2014-09-05 20:32:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-05 20:32:32 +0000 |
| commit | 7d0db3c3640584c2270ea8cc27704a7044fc52b6 (patch) | |
| tree | 264c9125f9cf2fab60252a197a2ca4c7c3684ccf /tests/OneMedia | |
| parent | 88d98d3aab1a87a87b47147a7c55a2af7abc2734 (diff) | |
| parent | 006775875a25a4708ff532d9efc7990cb60063c0 (diff) | |
am 8fe00fb8: am a21df8dd: am 52dcc8a1: Merge "rename add/removeCallback to register/unregisterCallback" into lmp-dev
* commit '8fe00fb8658c49a4bfd6e5bb4665d91f3879fcf6':
rename add/removeCallback to register/unregisterCallback
Diffstat (limited to 'tests/OneMedia')
| -rw-r--r-- | tests/OneMedia/src/com/android/onemedia/NotificationHelper.java | 4 | ||||
| -rw-r--r-- | tests/OneMedia/src/com/android/onemedia/PlayerController.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/OneMedia/src/com/android/onemedia/NotificationHelper.java b/tests/OneMedia/src/com/android/onemedia/NotificationHelper.java index d1172ace49a9..ceb0937b9165 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 c8d72ca6087a..7861bcc5cdd0 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); |