From f51097c743fc43ac52b343cf1066801d918f6fa0 Mon Sep 17 00:00:00 2001 From: zhangshuxiao Date: Wed, 13 Jan 2016 10:35:01 +0800 Subject: [PATCH] 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 Change-Id: Ieb7429511898a5ed3d44fd15fc1f250c122e802a --- wifi/java/android/net/wifi/WifiInfo.java | 3 ++- wifi/java/android/net/wifi/WifiSsid.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/wifi/java/android/net/wifi/WifiInfo.java b/wifi/java/android/net/wifi/WifiInfo.java index 9f8af6e2224c1..8d5efba8620e7 100644 --- a/wifi/java/android/net/wifi/WifiInfo.java +++ b/wifi/java/android/net/wifi/WifiInfo.java @@ -320,7 +320,8 @@ public class WifiInfo implements Parcelable { 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 index f8ba95dc07de6..c53cd3c6454e1 100644 --- a/wifi/java/android/net/wifi/WifiSsid.java +++ b/wifi/java/android/net/wifi/WifiSsid.java @@ -205,7 +205,7 @@ public class WifiSsid implements Parcelable { 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} */