diff options
| author | Roshan Pius <rpius@google.com> | 2020-05-31 16:42:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-31 16:42:14 +0000 |
| commit | 3b6f53a7435f859601328944a5b1ef326b60a024 (patch) | |
| tree | db92bc3a337c4f9f07985ac7a572bf2d101ad842 /service | |
| parent | 770598c90f78fe6870ccadb669abb61b1cc67975 (diff) | |
| parent | 06245b30b57990d4c529d19c99838708cefd0d7a (diff) | |
Merge changes I514b5b3a,Id67082c5 into rvc-dev am: 552cfec4db am: 06245b30b5
Change-Id: I23db879697b9e44aec77baac1a79e58cb050cf94
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/ClientModeImpl.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/service/java/com/android/server/wifi/ClientModeImpl.java b/service/java/com/android/server/wifi/ClientModeImpl.java index ac1c8d0b4..5b616dd0a 100644 --- a/service/java/com/android/server/wifi/ClientModeImpl.java +++ b/service/java/com/android/server/wifi/ClientModeImpl.java @@ -368,7 +368,7 @@ public class ClientModeImpl extends StateMachine { private String mTargetBssid = SUPPLICANT_BSSID_ANY; // This one is used to track the current target network ID. This is used for error // handling during connection setup since many error message from supplicant does not report - // SSID Once connected, it will be set to invalid + // SSID. Once connected, it will be set to invalid private int mTargetNetworkId = WifiConfiguration.INVALID_NETWORK_ID; private long mLastDriverRoamAttempt = 0; private WifiConfiguration mTargetWifiConfiguration = null; @@ -1211,8 +1211,8 @@ public class ClientModeImpl extends StateMachine { private void connectToUserSelectNetwork(int netId, int uid, boolean forceReconnect) { logd("connectToUserSelectNetwork netId " + netId + ", uid " + uid + ", forceReconnect = " + forceReconnect); - if (!forceReconnect && mWifiInfo.getNetworkId() == netId) { - // We're already connected to the user specified network, don't trigger a + if (!forceReconnect && (mLastNetworkId == netId || mTargetNetworkId == netId)) { + // We're already connecting/connected to the user specified network, don't trigger a // reconnection unless it was forced. logi("connectToUserSelectNetwork already connecting/connected=" + netId); } else { |