Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 2298d68e: Merge "Fix bug managing wifi display routes." into jb-mr2-dev

Browse Source 
* commit '2298d68e72afa9cf311af394b61f92f75385bbbf':
  Fix bug managing wifi display routes.
This commit is contained in:
Jeff Brown
2013-05-09 16:23:40 -07:00
committed by Android Git Automerger
parent 069d7e9b81 2298d68e72
commit 507a3c77d5
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
media/java/android/media/MediaRouter.java
View File

@@ -783,25 +783,21 @@ public class MediaRouter {
for (int i = 0; i < newDisplays.length; i++) { for (int i = 0; i < newDisplays.length; i++) {
final WifiDisplay d = newDisplays[i]; final WifiDisplay d = newDisplays[i];
final WifiDisplay oldRemembered = findMatchingDisplay(d, oldDisplays); final boolean available = findMatchingDisplay(d, availableDisplays) != null;
if (oldRemembered == null) { RouteInfo route = findWifiDisplayRoute(d);
addRouteStatic(makeWifiDisplayRoute(d, if (route == null) {
findMatchingDisplay(d, availableDisplays) != null)); route = makeWifiDisplayRoute(d, available);
addRouteStatic(route);
wantScan = true; wantScan = true;
} else { } else {
final boolean available = findMatchingDisplay(d, availableDisplays) != null;
final RouteInfo route = findWifiDisplayRoute(d);
updateWifiDisplayRoute(route, d, available, newStatus); updateWifiDisplayRoute(route, d, available, newStatus);
} }
if (d.equals(activeDisplay)) { if (d.equals(activeDisplay)) {
final RouteInfo activeRoute = findWifiDisplayRoute(d); selectRouteStatic(route.getSupportedTypes(), route);
if (activeRoute != null) {
selectRouteStatic(activeRoute.getSupportedTypes(), activeRoute);
// Don't scan if we're already connected to a wifi display, // Don't scan if we're already connected to a wifi display,
// the scanning process can cause a hiccup with some configurations. // the scanning process can cause a hiccup with some configurations.
blockScan = true; blockScan = true;
}
} }
} }
for (int i = 0; i < oldDisplays.length; i++) { for (int i = 0; i < oldDisplays.length; i++) {