diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2014-09-17 00:23:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-17 00:23:02 +0000 |
| commit | 8a2fafdf1fce098989044f432689d8c7f341bee0 (patch) | |
| tree | 1ab5a5352622756883f84c995aaf4aa619c6b8c4 | |
| parent | 4999461cf9ac0097de22ab4032460408c4d81f76 (diff) | |
| parent | fc797cf48feed42a76fccef73eeed535e1848702 (diff) | |
| download | wifi-8a2fafdf1fce098989044f432689d8c7f341bee0.tar.gz | |
am fc797cf4: Merge "Add NetworkAgent event for ExplicitlySelected" into lmp-dev
* commit 'fc797cf48feed42a76fccef73eeed535e1848702':
Add NetworkAgent event for ExplicitlySelected
| -rw-r--r-- | service/java/com/android/server/wifi/WifiStateMachine.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java index 71da665ed..8ccde9df0 100644 --- a/service/java/com/android/server/wifi/WifiStateMachine.java +++ b/service/java/com/android/server/wifi/WifiStateMachine.java @@ -6792,6 +6792,10 @@ public class WifiStateMachine extends StateMachine { DetailedState.CAPTIVE_PORTAL_CHECK); sendNetworkStateChangeBroadcast(mLastBssid); + if (mWifiConfigStore.getLastSelectedConfiguration() != null) { + if (mNetworkAgent != null) mNetworkAgent.explicitlySelected(); + } + setNetworkDetailedState(DetailedState.CONNECTED); mWifiConfigStore.updateStatus(mLastNetworkId, DetailedState.CONNECTED); sendNetworkStateChangeBroadcast(mLastBssid); |