diff options
| author | Chong Zhang <chz@google.com> | 2013-11-20 14:34:00 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-20 14:34:00 -0800 |
| commit | ab6294e4bb2830a3bc161bcfec15904685e8b5b5 (patch) | |
| tree | 1ccdc06b1f3e6a0dea8bc9b5510565e8ef6707e8 /media | |
| parent | 5d958998811d6e291e2eff86033083548b47ac2c (diff) | |
| parent | db44cb92ecae78f0fa5a8fe60eb1d35393c67507 (diff) | |
| download | frameworks_base-ab6294e4bb2830a3bc161bcfec15904685e8b5b5.zip frameworks_base-ab6294e4bb2830a3bc161bcfec15904685e8b5b5.tar.gz frameworks_base-ab6294e4bb2830a3bc161bcfec15904685e8b5b5.tar.bz2 | |
am db44cb92: am 6b0653ff: am bfdecccc: Merge "Only scan for wifi display when there is no active connections" into klp-dev
* commit 'db44cb92ecae78f0fa5a8fe60eb1d35393c67507':
Only scan for wifi display when there is no active connections
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/MediaRouter.java | 6 |
1 files changed, 0 insertions, 6 deletions
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 @@ 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) { |