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

Commit 4af5c34a authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Gerrit Code Review
Browse files

Merge "When wifi ssid is empty, return WifiSsid.NONE"

parents 453a77c7 91ec9298

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