diff options
| author | RoboErik <epastern@google.com> | 2014-09-05 19:49:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-05 19:49:36 +0000 |
| commit | dfafca76919808db583fbe53765b6358ee955122 (patch) | |
| tree | c71cdd4876307510f504b57d06bc73bef5c1a8f5 /tests | |
| parent | 845755d6e7febc24a6d7a26e68ec2414fe736367 (diff) | |
| parent | 14f717a506a0d22facbec07386b06634e0c6a8ee (diff) | |
| download | frameworks_base-dfafca76919808db583fbe53765b6358ee955122.zip frameworks_base-dfafca76919808db583fbe53765b6358ee955122.tar.gz frameworks_base-dfafca76919808db583fbe53765b6358ee955122.tar.bz2 | |
Merge "rename add/removeCallback to register/unregisterCallback" into lmp-dev
Diffstat (limited to 'tests')
| -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 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); |