WifiStateMachine: set supplicant log level after supplicant starts

When we start supplicant, we want to set its logging level to
reflect the logging level of WifiService. At present, we attempt
to set supplicant's logging level immediately after we
enableSupplicant().

This is problematic, because enableSupplicant() does not actually
block until supplicant is ready. Hence, the request to set supplicant's
logging level can be (and sometimes is) dropped.

Resolve this problem, by waiting for WifiMonitor.startMonitoring()
to return, before setting supplicant's logging level. (startMonitoring
is a blocking call.)

Note that, with this change, we'll no longer have any chance of
seeing debug-level log messages in the window from when supplicant
is started, until startMonitoring() returns. But I don't think such
messages are very important anyway.

Bug: 33462714
Test: manual (see below)

Manual test
-----------
1. flash DUT
2. Settings -> Developer options -> Enable Wi-Fi Verbose Logging -> On
3. reboot
4. adb shell logcat -d | grep ' D wpa_supplicant: ' | wc -l
   -> should be non-zero

Change-Id: Iaf9e3e8c047367ae55086d4d680664c6d954ebee

1 files changed, 1 insertions, 1 deletions

diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java
index d6179e513..d743a3cd1 100644
--- a/service/java/com/android/server/wifi/WifiStateMachine.java
+++ b/service/java/com/android/server/wifi/WifiStateMachine.java
@@ -4014,10 +4014,10 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss
                         cleanup();
                         break;
                     }
-                    setSupplicantLogLevel();
                     setWifiState(WIFI_STATE_ENABLING);
                     if (mVerboseLoggingEnabled) log("Supplicant start successful");
                     mWifiMonitor.startMonitoring(mInterfaceName, true);
+                    setSupplicantLogLevel();
                     transitionTo(mSupplicantStartingState);
                     break;
                 case CMD_START_AP: