Merge "Restrict MediaRouter selection" into jb-dev

adamp · Android (Google) Code Review · commit eb2c1b21c683 · 2012-06-18T12:10:20.000-07:00
diff --git a/media/java/android/media/MediaRouter.java b/media/java/android/media/MediaRouter.java
@@ -276,6 +276,7 @@ static void selectRouteStatic(int types, RouteInfo route) {
             Log.w(TAG, "selectRoute ignored; cannot select route with supported types " +
                     typesToString(route.getSupportedTypes()) + " into route types " +
                     typesToString(types));
+            return;
         }
 
         if (sStatic.mSelectedRoute != null) {

Original file line number	Diff line number	Diff line change
`@@ -276,6 +276,7 @@ static void selectRouteStatic(int types, RouteInfo route) {`
`276`	`276`	`Log.w(TAG, "selectRoute ignored; cannot select route with supported types " +`
`277`	`277`	`typesToString(route.getSupportedTypes()) + " into route types " +`
`278`	`278`	`typesToString(types));`
	`279`	`+ return;`
`279`	`280`	`}`
`280`	`281`
`281`	`282`	`if (sStatic.mSelectedRoute != null) {`