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

Commit f6682b03 authored by Robert Greenwalt's avatar Robert Greenwalt
Browse files

Fix NPE in toString 

bug:2965739
Change-Id: Ic3f274cba8ac668d86a8f69f1b2b738d348b3977
parent d50a6ec0

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();

    }