am 6b0653ff: am bfdecccc: Merge "Only scan for wifi display when there is no active connections" into klp-dev

* commit '6b0653ffadea757c87724594b70922cd11dcd835':
  Only scan for wifi display when there is no active connections
This commit is contained in:
Chong Zhang
2013-11-20 14:30:11 -08:00
committed by Android Git Automerger

View File

@@ -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) {