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

Commit d3afa8f8 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in toString"

parents 0dd89664 f6682b03

core/java/android/net/ProxyProperties.java

+6 −2
Original line number Diff line number Diff line
@@ -75,8 +75,12 @@ public class ProxyProperties implements Parcelable { 
    @Override

    public String toString() {

        StringBuilder sb = new StringBuilder();

        sb.append(mProxy.getHostAddress()).append(":").append(mPort)

          .append(" xl=").append(mExclusionList);

        if (mProxy != null) {

            sb.append(mProxy.getHostAddress()).append(":").append(mPort);

            if (mExclusionList != null) {

                    sb.append(" xl=").append(mExclusionList);

            }

        }

        return sb.toString();

    }