Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b33fbc33 authored by zhangshuxiao's avatar zhangshuxiao Committed by android-build-merger
Browse files

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

am: eef758cb

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

Change-Id: I179f5641cf98fdce947c4f61a2dd1d52595952b4
parents 1f12e831 eef758cb

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

+2 −1
Original line number Diff line number Diff line
@@ -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;

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

+1 −1
Original line number Diff line number Diff line
@@ -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} */