Don't auto-discover peers until scan requested.

Jeff Brown · Jeff Brown · commit 59c53c6224e2 · 2012-09-11T12:21:55.000-07:00
Change-Id: I4ad08873567a5ac86e9bd46abd2375b183e2e95b
diff --git a/services/java/com/android/server/display/WifiDisplayController.java b/services/java/com/android/server/display/WifiDisplayController.java
@@ -179,7 +179,6 @@ public void onSuccess() {
                     if (mWfdEnabling) {
                         mWfdEnabling = false;
                         setWfdEnabled(true);
-                        discoverPeers();
                     }
                 }
 
@@ -511,9 +510,7 @@ private void handleStateChanged(boolean enabled) {
         if (mWifiP2pEnabled != enabled) {
             mWifiP2pEnabled = enabled;
             if (enabled) {
-                if (mWfdEnabled) {
-                    discoverPeers();
-                } else {
+                if (!mWfdEnabled) {
                     enableWfd();
                 }
             } else {

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,6 @@ public void onSuccess() {`
`179`	`179`	`if (mWfdEnabling) {`
`180`	`180`	`mWfdEnabling = false;`
`181`	`181`	`setWfdEnabled(true);`
`182`		`- discoverPeers();`
`183`	`182`	`}`
`184`	`183`	`}`
`185`	`184`
`@@ -511,9 +510,7 @@ private void handleStateChanged(boolean enabled) {`
`511`	`510`	`if (mWifiP2pEnabled != enabled) {`
`512`	`511`	`mWifiP2pEnabled = enabled;`
`513`	`512`	`if (enabled) {`
`514`		`- if (mWfdEnabled) {`
`515`		`- discoverPeers();`
`516`		`- } else {`
	`513`	`+ if (!mWfdEnabled) {`
`517`	`514`	`enableWfd();`
`518`	`515`	`}`
`519`	`516`	`} else {`