merge in lmp-mr1-release history after reset to lmp-mr1-dev
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 694d69d..ba19499 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 @@
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 void setPlayer(Player player) {
mPlayer = player;
- if (mControllerDialog != null) {
- mControllerDialog.setMediaSession(mPlayer.getMediaSession().getSessionToken());
- }
}
}
}
diff --git a/sdk/support_source.prop_template b/sdk/support_source.prop_template
index 32750ba..78b8dd2 100644
--- a/sdk/support_source.prop_template
+++ b/sdk/support_source.prop_template
@@ -1,5 +1,5 @@
Pkg.UserSrc=false
-Pkg.Revision=${PLATFORM_SDK_VERSION}.0.2
+Pkg.Revision=${PLATFORM_SDK_VERSION}.0.3
Extra.Vendor=android
Extra.VendorId=android
Extra.VendorDisplay=Android