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

Commit 77b55262 authored by Paul Stewart's avatar Paul Stewart Committed by Android (Google) Code Review
Browse files

Merge changes Id25696e4,I939a12a2 into klp-dev 

* changes:
  Fix string equality comparison
  WifiEnterpriseConfiguration: Do not print credentials in toString
parents 8dbf0b55 1033c6fd

wifi/java/android/net/wifi/WifiEnterpriseConfig.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -837,7 +837,9 @@ public class WifiEnterpriseConfig implements Parcelable { 
    public String toString() {

    public String toString() {

        StringBuffer sb = new StringBuffer();

        StringBuffer sb = new StringBuffer();

        for (String key : mFields.keySet()) {

        for (String key : mFields.keySet()) {

            sb.append(key).append(" ").append(mFields.get(key)).append("\n");

            // Don't display password in toString().

            String value = PASSWORD_KEY.equals(key) ? "<removed>" : mFields.get(key);

            sb.append(key).append(" ").append(value).append("\n");

        }

        }

        return sb.toString();

        return sb.toString();

    }

    }