diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-03-30 10:00:22 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-03-30 10:00:22 +0000 |
| commit | d102b9c5c16f2a645b672361ec582c0befa35678 (patch) | |
| tree | d30f1d14241877e36ec320a0902b163edbc4d1f2 | |
| parent | fe62d25331c3d4b25055f9a519ecd039f253f476 (diff) | |
| parent | 0bb78000b3700188542ed498637b43838080fdd2 (diff) | |
Merge "Revert "Revert "WifiStateMachine: remove ssid from NetworkInfo""" into pi-dev
| -rw-r--r-- | service/java/com/android/server/wifi/WifiStateMachine.java | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java index 2effc4ab4..eb3848dc6 100644 --- a/service/java/com/android/server/wifi/WifiStateMachine.java +++ b/service/java/com/android/server/wifi/WifiStateMachine.java @@ -61,7 +61,6 @@ import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiEnterpriseConfig; import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; -import android.net.wifi.WifiSsid; import android.net.wifi.hotspot2.IProvisioningCallback; import android.net.wifi.hotspot2.OsuProvider; import android.net.wifi.hotspot2.PasspointConfiguration; @@ -2786,23 +2785,12 @@ public class WifiStateMachine extends StateMachine { + mNetworkInfo.getDetailedState() + " and new state=" + state + " hidden=" + hidden); } - if (mNetworkInfo.getExtraInfo() != null && mWifiInfo.getSSID() != null - && !mWifiInfo.getSSID().equals(WifiSsid.NONE)) { - // Always indicate that SSID has changed - if (!mNetworkInfo.getExtraInfo().equals(mWifiInfo.getSSID())) { - if (mVerboseLoggingEnabled) { - log("setDetailed state send new extra info" + mWifiInfo.getSSID()); - } - mNetworkInfo.setExtraInfo(mWifiInfo.getSSID()); - sendNetworkStateChangeBroadcast(null); - } - } if (hidden == true) { return false; } if (state != mNetworkInfo.getDetailedState()) { - mNetworkInfo.setDetailedState(state, null, mWifiInfo.getSSID()); + mNetworkInfo.setDetailedState(state, null, null); if (mNetworkAgent != null) { mNetworkAgent.sendNetworkInfo(mNetworkInfo); } |