Update to MediaSession.Callback
The Callback and the TransportControlsCallback were combined. This updates
to match the new APIs.
Change-Id: I9ec1ee2fb53668b2be4855696b0dc722b0e3f2f0
diff --git a/Common/src/com/googlecode/android_scripting/facade/media/MediaButtonCallback.java b/Common/src/com/googlecode/android_scripting/facade/media/MediaButtonCallback.java
index 7058d29..82f5382 100644
--- a/Common/src/com/googlecode/android_scripting/facade/media/MediaButtonCallback.java
+++ b/Common/src/com/googlecode/android_scripting/facade/media/MediaButtonCallback.java
@@ -40,7 +40,7 @@
}
@Override
- public void onMediaButtonEvent(Intent mediaButtonIntent) {
+ public boolean onMediaButtonEvent(Intent mediaButtonIntent) {
String action = mediaButtonIntent.getAction();
Log.d("Received intent with action " + action);
if (action.equals(Intent.ACTION_MEDIA_BUTTON)) {
@@ -53,6 +53,8 @@
} else if (keyAction == KeyEvent.ACTION_UP) {
handleKeyEvent(event);
}
+ return true;
}
+ return super.onMediaButtonEvent(mediaButtonIntent);
}
}
\ No newline at end of file
diff --git a/Common/src/com/googlecode/android_scripting/facade/media/MediaSessionFacade.java b/Common/src/com/googlecode/android_scripting/facade/media/MediaSessionFacade.java
index 70189d0..83c4bc0 100644
--- a/Common/src/com/googlecode/android_scripting/facade/media/MediaSessionFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/media/MediaSessionFacade.java
@@ -95,7 +95,7 @@
@Override
public Object call() throws Exception {
Log.d("Adding callback.");
- mSession.addCallback(mCallback);
+ mSession.setCallback(mCallback);
PlaybackState.Builder bob = new PlaybackState.Builder();
bob.setActions(PlaybackState.ACTION_PLAY |
PlaybackState.ACTION_PAUSE |
@@ -169,7 +169,7 @@
@Override
public void shutdown() {
- mSession.removeCallback(mCallback);
+ mSession.setCallback(null);
mSession.release();
}
}
