summaryrefslogtreecommitdiff
path: root/service
diff options
context:
space:
mode:
authorRandy Pan <zpan@google.com>2016-09-29 10:28:56 -0700
committerRandy Pan <zpan@google.com>2016-09-29 10:31:38 -0700
commit75381beb160f85e127f9baf929aac7226b5d1754 (patch)
treecd52f2fe9623c80ae8f70ce1d0d4099c12006bc5 /service
parent8098201f7351a41f55524fbe09fb4332d34f7094 (diff)
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
Diffstat (limited to 'service')
-rw-r--r--service/java/com/android/server/wifi/WifiStateMachine.java18
1 files changed, 9 insertions, 9 deletions
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);