commit f51097c743fc43ac52b343cf1066801d918f6fa0
author zhangshuxiao <zhangshuxiao@xiaomi.com> Wed Jan 13 10:35:01 2016 +0800
committer Ningyuan Wang <nywang@google.com> Tue Mar 29 16:35:47 2016 -0700
tree 2d649f01c6ace8a4bb41734fbf039962c3cccebb
parent af64f6341bdbca93aff3d68264af48e74faa9e58

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.

Cherry pick from I241f8e9c11dc16db26cadde133043745f2f19573

BUG=27403109
TEST=compile and unittests
Signed-off-by: zhangshuxiao <zhangshuxiao@xiaomi.com>

Change-Id: Ieb7429511898a5ed3d44fd15fc1f250c122e802a

wifi/java/android/net/wifi/WifiInfo.java

diff --git a/wifi/java/android/net/wifi/WifiInfo.java b/wifi/java/android/net/wifi/WifiInfo.java
index 9f8af6e..8d5efba 100644
--- a/wifi/java/android/net/wifi/WifiInfo.java
+++ b/wifi/java/android/net/wifi/WifiInfo.java
@@ -320,7 +320,8 @@
             if (!TextUtils.isEmpty(unicode)) {
                 return "\"" + unicode + "\"";
             } else {
-                return mWifiSsid.getHexString();
+                String hex = mWifiSsid.getHexString();
+                return (hex != null) ? hex : WifiSsid.NONE;
             }
         }
         return WifiSsid.NONE;

wifi/java/android/net/wifi/WifiSsid.java

diff --git a/wifi/java/android/net/wifi/WifiSsid.java b/wifi/java/android/net/wifi/WifiSsid.java
index f8ba95d..c53cd3c 100644
--- a/wifi/java/android/net/wifi/WifiSsid.java
+++ b/wifi/java/android/net/wifi/WifiSsid.java
@@ -205,7 +205,7 @@
         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} */