diff options
| author | vandwalle <vandwalle@google.com> | 2014-09-24 02:36:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-24 02:36:11 +0000 |
| commit | 6046bb9a41f8a477c7fcb3aa8446ac95a085e733 (patch) | |
| tree | 15666b17233cd932912571add6dee8092c74cb6e | |
| parent | 5c01aa5ee40647f8975d9ceb7ca7188dc3ce1f86 (diff) | |
| parent | 9d082c381274f27dad1e344223189e00148e2124 (diff) | |
| download | wifi-6046bb9a41f8a477c7fcb3aa8446ac95a085e733.tar.gz | |
am 9d082c38: inconditionally issue the reassociate command in the case of linkdebouncing, dont treat AUTO_SAVE commands coming from autojoincontroller as user triggered WifiManager.SAVE_NETWORK commands Bug:17624613
* commit '9d082c381274f27dad1e344223189e00148e2124':
inconditionally issue the reassociate command in the case of linkdebouncing, dont treat AUTO_SAVE commands coming from autojoincontroller as user triggered WifiManager.SAVE_NETWORK commands Bug:17624613
| -rw-r--r-- | service/java/com/android/server/wifi/WifiStateMachine.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java index a54f8290a..c2b822242 100644 --- a/service/java/com/android/server/wifi/WifiStateMachine.java +++ b/service/java/com/android/server/wifi/WifiStateMachine.java @@ -6327,13 +6327,15 @@ public class WifiStateMachine extends StateMachine { + Integer.toString(result.getNetworkId())); } - /** - * Tell autojoin the user did try to modify and save that network, - * and interpret the SAVE_NETWORK as a request to connect - */ synchronized(mScanResultCache) { + /** + * If the command comes from WifiManager, then + * tell autojoin the user did try to modify and save that network, + * and interpret the SAVE_NETWORK as a request to connect + */ + boolean user = message.what == WifiManager.SAVE_NETWORK; mWifiAutoJoinController.updateConfigurationHistory(result.getNetworkId() - , true, true); + , user, true); mWifiAutoJoinController.attemptAutoJoin(); } } else { @@ -7248,7 +7250,7 @@ public class WifiStateMachine extends StateMachine { + " targetRoamBSSID " + mTargetRoamBSSID); /* Save the BSSID so as to lock it @ firmware */ - if (!autoRoamSetBSSID(config, bssid)) { + if (!autoRoamSetBSSID(config, bssid) && !linkDebouncing) { loge("AUTO_ROAM nothing to do"); // Same BSSID, nothing to do messageHandlingStatus = MESSAGE_HANDLING_STATUS_DISCARD; |