commit aac5bf1c1c60fac2db26c1ec68b85a7232816682
author Ningyuan Wang <nywang@google.com> Wed Mar 30 01:25:47 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 30 01:25:49 2016 +0000
tree eea898fa31fcc5a49f4f093f1d1103f1ba9efd07
parent bc786b74759470e52f3f5e80c3f4b5b1c0a52636
parent f51097c743fc43ac52b343cf1066801d918f6fa0

Merge "When wifi ssid is empty, return WifiSsid.NONE" into nyc-dev

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} */