commit 6f46672fdd252fb4e9bb5f6bbac0d5cf703cfabd
author Chong Zhang <chz@google.com> Tue Nov 19 19:13:22 2013 -0800
committer The Android Automerger <android-build@google.com> Thu Nov 21 03:32:56 2013 -0800
tree aecb07b13e1d8dd0c605fff16f55fd58b544d469
parent 28b6d3829166935f50684c0152a154cd4f1bbb90

Only scan for wifi display when there is no active connections

Bug: 11717053
Change-Id: I4ab73f6517fbfb8fcc131b89d0e934380dcf69e0

media/java/android/media/MediaRouter.java

diff --git a/media/java/android/media/MediaRouter.java b/media/java/android/media/MediaRouter.java
index 525dc4f..3f1851d 100644
--- a/media/java/android/media/MediaRouter.java
+++ b/media/java/android/media/MediaRouter.java
@@ -1343,12 +1343,6 @@
                 }
             }
         }
-
-        // 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) {