WifiNetworkFactory: Defer turning off auto-join

Currently, we turn off auto-join when we start processing a new
(specific) network request. Defer this to after the user picks a network
from the UI.

Bug: 117979585
Test: ./frameworks/opt/net/wifi/tests/wifitests/runtests.sh
Test: act.py -c wifi_manager.config -tb dut-name -tc WifiNetworkRequestTest
Change-Id: I4b5ded6d01b5247af90fb95bfe1f584ff4f10a7a

1 files changed, 3 insertions, 3 deletions

diff --git a/service/java/com/android/server/wifi/WifiNetworkFactory.java b/service/java/com/android/server/wifi/WifiNetworkFactory.java
index dc2ad87f8..369e36cb5 100644
--- a/service/java/com/android/server/wifi/WifiNetworkFactory.java
+++ b/service/java/com/android/server/wifi/WifiNetworkFactory.java
@@ -382,9 +382,6 @@ public class WifiNetworkFactory extends NetworkFactory {
             // TODO(b/113878056): Start UI flow here.
             // Trigger periodic scans for finding a network in the request.
             startPeriodicScans();
-            // Disable Auto-join so that NetworkFactory can take control of the network selection.
-            // TODO(b/117979585): Defer turning off auto-join.
-            mWifiConnectivityManager.setSpecificNetworkRequestInProgress(true);
         }
     }
 
@@ -475,6 +472,9 @@ public class WifiNetworkFactory extends NetworkFactory {
         // Cancel the ongoing scans after user selection.
         cancelPeriodicScans();
 
+        // Disable Auto-join so that NetworkFactory can take control of the network connection.
+        mWifiConnectivityManager.setSpecificNetworkRequestInProgress(true);
+
         // Mark the network ephemeral so that it's automatically removed at the end of connection.
         network.ephemeral = true;
         // Store the user selected network.