summaryrefslogtreecommitdiff
path: root/samples
diff options
context:
space:
mode:
authorRoboErik <epastern@google.com>2014-12-04 13:51:26 -0800
committerRoboErik <epastern@google.com>2014-12-04 13:51:26 -0800
commit4424852bbb6e9fd2b3e078cd54b73f6a4ea56a26 (patch)
tree7650c34e7424b734a6464630876e026c63875de6 /samples
parent154cfd7a55e432f38c2550cecc2e142fd8d8d782 (diff)
Updates for compatLib changes to MedaiRouter support lib
The ControllerDialog in MediaRouter now gets the session token from the MediaRouter instead of needing it to be set. Removed the calls to set it directly on the dialog. bug:18186638 Change-Id: If7499108c226d3405ea70e2f332694a92a921e50
Diffstat (limited to 'samples')
-rw-r--r--samples/Support7Demos/src/com/example/android/supportv7/media/SampleMediaRouterActivity.java6
1 files changed, 0 insertions, 6 deletions
diff --git a/samples/Support7Demos/src/com/example/android/supportv7/media/SampleMediaRouterActivity.java b/samples/Support7Demos/src/com/example/android/supportv7/media/SampleMediaRouterActivity.java
index 694d69d3d..ba1949965 100644
--- a/samples/Support7Demos/src/com/example/android/supportv7/media/SampleMediaRouterActivity.java
+++ b/samples/Support7Demos/src/com/example/android/supportv7/media/SampleMediaRouterActivity.java
@@ -753,9 +753,6 @@ public class SampleMediaRouterActivity extends ActionBarActivity {
Context context, Bundle savedInstanceState) {
mControllerDialog = super.onCreateControllerDialog(context,
savedInstanceState);
- if (mPlayer != null) {
- mControllerDialog.setMediaSession(mPlayer.getMediaSession().getSessionToken());
- }
mControllerDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override
public void onDismiss(DialogInterface dialog) {
@@ -767,9 +764,6 @@ public class SampleMediaRouterActivity extends ActionBarActivity {
public void setPlayer(Player player) {
mPlayer = player;
- if (mControllerDialog != null) {
- mControllerDialog.setMediaSession(mPlayer.getMediaSession().getSessionToken());
- }
}
}
}