From 4424852bbb6e9fd2b3e078cd54b73f6a4ea56a26 Mon Sep 17 00:00:00 2001 From: RoboErik Date: Thu, 4 Dec 2014 13:51:26 -0800 Subject: [PATCH] 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 --- .../android/supportv7/media/SampleMediaRouterActivity.java | 6 ------ 1 file changed, 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()); - } } } }