When wifi ssid is empty, return WifiSsid.NONE

Issue 199610 When WifistateMachine enter Roaming State, WifiInfo getSSID will return 0x, statusbar show "0x", because roaming State do not update WifiInfo mWifiSsid. Change-Id: I241f8e9c11dc16db26cadde133043745f2f19573 Signed-off-by: zhangshuxiao <[email protected]>
zsol · Mar 31, 2016 · 3d923ad · 3d923ad
1 parent ac2e6a7
commit 3d923ad
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/wifi/java/android/net/wifi/WifiInfo.java b/wifi/java/android/net/wifi/WifiInfo.java
@@ -320,7 +320,8 @@ public String getSSID() {
             if (!TextUtils.isEmpty(unicode)) {
                 return "\"" + unicode + "\"";
             } else {
-                return mWifiSsid.getHexString();
+                String hex = mWifiSsid.getHexString();
+                return (hex != null) ? hex : WifiSsid.NONE;
             }
         }
         return WifiSsid.NONE;

diff --git a/wifi/java/android/net/wifi/WifiSsid.java b/wifi/java/android/net/wifi/WifiSsid.java
@@ -205,7 +205,7 @@ public String getHexString() {
         for (int i = 0; i < octets.size(); i++) {
             out += String.format(Locale.US, "%02x", ssidbytes[i]);
         }
-        return out;
+        return (octets.size() > 0) ? out : null;
     }
 
     /** Implement the Parcelable interface {@hide} */