Merge "Permit MediaRouteButton to select system routes in toggle mode." into jb-dev

adamp · Android (Google) Code Review · commit 2a2b021a2133 · 2012-06-19T17:00:35.000-07:00
diff --git a/core/java/android/app/MediaRouteButton.java b/core/java/android/app/MediaRouteButton.java
@@ -110,7 +110,7 @@ public boolean performClick() {
                     final RouteInfo route = mRouter.getRouteAt(i);
                     if ((route.getSupportedTypes() & mRouteTypes) != 0 &&
                             route != mRouter.getSystemAudioRoute()) {
-                        mRouter.selectRoute(mRouteTypes, route);
+                        mRouter.selectRouteInt(mRouteTypes, route);
                     }
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ public boolean performClick() {`
`110`	`110`	`final RouteInfo route = mRouter.getRouteAt(i);`
`111`	`111`	`if ((route.getSupportedTypes() & mRouteTypes) != 0 &&`
`112`	`112`	`route != mRouter.getSystemAudioRoute()) {`
`113`		`- mRouter.selectRoute(mRouteTypes, route);`
	`113`	`+ mRouter.selectRouteInt(mRouteTypes, route);`
`114`	`114`	`}`
`115`	`115`	`}`
`116`	`116`	`}`