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

* commit '2298d68e72afa9cf311af394b61f92f75385bbbf':
  Fix bug managing wifi display routes.

1 files changed, 9 insertions, 13 deletions

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