Merge "Only scan for wifi display when there is no active connections" into klp-dev

2013-11-20 22:24:20 +00:00
parent bc77af5b4c a68c87eda8
commit bfdecccc48
1 changed files with 0 additions and 6 deletions
--- a/media/java/android/media/MediaRouter.java
+++ b/media/java/android/media/MediaRouter.java
@@ -1343,12 +1343,6 @@ public class MediaRouter {
                }
            }
        }
-
-        // Don't scan if we're already connected to a wifi display,
-        // the scanning process can cause a hiccup with some configurations.
-        if (wantScan && activeDisplay != null && sStatic.mCanConfigureWifiDisplays) {
-            sStatic.mDisplayService.scanWifiDisplays();
-        }
    }

    private static boolean shouldShowWifiDisplay(WifiDisplay d, WifiDisplay activeDisplay) {