From 75381beb160f85e127f9baf929aac7226b5d1754 Mon Sep 17 00:00:00 2001
From: Randy Pan <zpan@google.com>
Date: Thu, 29 Sep 2016 10:28:56 -0700
Subject: WSM: Fix roaming log message

Fix the log message which prints out the roaming target network
BSSID.

Bug: 31317756
Test: unit tests
Merged-In: I4a7d2dbacbbaa73d4141be306e58369eba16fbba
Change-Id: I4a7d2dbacbbaa73d4141be306e58369eba16fbba
---
 .../java/com/android/server/wifi/WifiStateMachine.java | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'service')

diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java
index 69f8836fa..2f0a5c0b4 100644
--- a/service/java/com/android/server/wifi/WifiStateMachine.java
+++ b/service/java/com/android/server/wifi/WifiStateMachine.java
@@ -5078,17 +5078,18 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss
                     netId = message.arg1;
                     bssid = (String) message.obj;
                     config = mWifiConfigManager.getConfiguredNetworkWithPassword(netId);
-                    logd("CMD_START_CONNECT sup state "
-                            + mSupplicantStateTracker.getSupplicantStateName()
-                            + " my state " + getCurrentState().getName()
-                            + " nid=" + Integer.toString(netId)
-                            + " roam=" + Boolean.toString(mAutoRoaming));
                     if (config == null) {
                         loge("CMD_START_CONNECT and no config, bail out...");
                         break;
                     }
                     mTargetNetworkId = netId;
                     setTargetBssid(config, bssid);
+                    logd("CMD_START_CONNECT sup state "
+                            + mSupplicantStateTracker.getSupplicantStateName()
+                            + " my state " + getCurrentState().getName()
+                            + " nid=" + Integer.toString(netId)
+                            + " config " + config.configKey()
+                            + " targetRoamBSSID " + mTargetRoamBSSID);
 
                     mWifiMetrics.startConnectionEvent(config, mTargetRoamBSSID,
                             WifiMetricsProto.ConnectionEvent.ROAM_UNRELATED);
@@ -6223,16 +6224,15 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss
                         loge("CMD_START_ROAM and no config, bail out...");
                         break;
                     }
+                    mTargetNetworkId = netId;
+                    setTargetBssid(config, bssid);
+
                     logd("CMD_START_ROAM sup state "
                             + mSupplicantStateTracker.getSupplicantStateName()
                             + " my state " + getCurrentState().getName()
                             + " nid=" + Integer.toString(netId)
                             + " config " + config.configKey()
-                            + " roam=" + Integer.toString(message.arg2)
-                            + " to " + bssid
                             + " targetRoamBSSID " + mTargetRoamBSSID);
-                    mTargetNetworkId = netId;
-                    setTargetBssid(config, bssid);
 
                     mWifiMetrics.startConnectionEvent(config, mTargetRoamBSSID,
                             WifiMetricsProto.ConnectionEvent.ROAM_ENTERPRISE);
-- 
cgit v1.2.3