am eb2c1b21: Merge "Restrict MediaRouter selection" into jb-dev

* commit 'eb2c1b21c6835399fa55227e498fb2930e533439': Restrict MediaRouter selection
2012-06-18 12:12:00 -07:00
parent 45c4a8df94 eb2c1b21c6
commit 12c2fbd3b7
1 changed files with 1 additions and 0 deletions
--- a/media/java/android/media/MediaRouter.java
+++ b/media/java/android/media/MediaRouter.java
@@ -276,6 +276,7 @@ public class MediaRouter {
            Log.w(TAG, "selectRoute ignored; cannot select route with supported types " +
                    typesToString(route.getSupportedTypes()) + " into route types " +
                    typesToString(types));
+            return;
        }

        if (sStatic.mSelectedRoute != null) {