PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename WifiSsid.NONE to WifiManager.UNKNOWN_SSID"

Browse Source
This commit is contained in:
David Su
2019-11-20 18:57:28 +00:00
committed by Android (Google) Code Review
parent ea0b2bfaac 6d2c28f22a
commit f4bb306eec
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/wifi/slice/ContextualWifiSlice.java
View File

@@ -21,7 +21,6 @@ import android.net.NetworkCapabilities;
import android.net.Uri; import android.net.Uri;
import android.net.wifi.WifiInfo; import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
import android.net.wifi.WifiSsid;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
@@ -72,12 +71,12 @@ public class ContextualWifiSlice extends WifiSlice {
} }
private boolean hasWorkingNetwork() { private boolean hasWorkingNetwork() {
return !TextUtils.equals(getActiveSSID(), WifiSsid.NONE) && hasInternetAccess(); return !TextUtils.equals(getActiveSSID(), WifiManager.UNKNOWN_SSID) && hasInternetAccess();
} }
private String getActiveSSID() { private String getActiveSSID() {
if (mWifiManager.getWifiState() != WifiManager.WIFI_STATE_ENABLED) { if (mWifiManager.getWifiState() != WifiManager.WIFI_STATE_ENABLED) {
return WifiSsid.NONE; return WifiManager.UNKNOWN_SSID;
} }
return WifiInfo.removeDoubleQuotes(mWifiManager.getConnectionInfo().getSSID()); return WifiInfo.removeDoubleQuotes(mWifiManager.getConnectionInfo().getSSID());
} }