commit 59c53c6224e2f84d31a56854ebe90d22055100d2
author Jeff Brown <jeffbrown@google.com> Tue Sep 11 12:21:55 2012 -0700
committer Jeff Brown <jeffbrown@google.com> Tue Sep 11 12:21:55 2012 -0700
tree 71d8f4378b724a73eb8b0f05ebfd3c7c21be6992
parent 0f68d166e6ca45fe27410ea520967275e0733757

Don't auto-discover peers until scan requested.

Change-Id: I4ad08873567a5ac86e9bd46abd2375b183e2e95b

services/java/com/android/server/display/WifiDisplayController.java

diff --git a/services/java/com/android/server/display/WifiDisplayController.java b/services/java/com/android/server/display/WifiDisplayController.java
index f5ec0b7..144b391 100644
--- a/services/java/com/android/server/display/WifiDisplayController.java
+++ b/services/java/com/android/server/display/WifiDisplayController.java
@@ -179,7 +179,6 @@
                     if (mWfdEnabling) {
                         mWfdEnabling = false;
                         setWfdEnabled(true);
-                        discoverPeers();
                     }
                 }
 
@@ -511,9 +510,7 @@
         if (mWifiP2pEnabled != enabled) {
             mWifiP2pEnabled = enabled;
             if (enabled) {
-                if (mWfdEnabled) {
-                    discoverPeers();
-                } else {
+                if (!mWfdEnabled) {
                     enableWfd();
                 }
             } else {