Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "When wifi ssid is empty, return WifiSsid.NONE" am: 4af5c34

Browse Source 
am: eef758c

* commit 'eef758cb01df94642ddf1a50ccc434b4a4b343fc':
  When wifi ssid is empty, return WifiSsid.NONE

Change-Id: I179f5641cf98fdce947c4f61a2dd1d52595952b4
This commit is contained in:
zhangshuxiao
2016-03-29 22:51:07 +00:00
committed by android-build-merger
parent 1f12e8316b eef758cb01
commit b33fbc33c6
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wifi/java/android/net/wifi/WifiInfo.java
View File

@@ -320,7 +320,8 @@ public class WifiInfo implements Parcelable {
if (!TextUtils.isEmpty(unicode)) { if (!TextUtils.isEmpty(unicode)) {
return "\"" + unicode + "\""; return "\"" + unicode + "\"";
} else { } else {
return mWifiSsid.getHexString(); String hex = mWifiSsid.getHexString();
return (hex != null) ? hex : WifiSsid.NONE;
} }
} }
return WifiSsid.NONE; return WifiSsid.NONE;

2
wifi/java/android/net/wifi/WifiSsid.java
View File

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