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

Commit ac19f24c authored by Andrew Stadler's avatar Andrew Stadler
Browse files

Fix crash when proxy exclusion list is null. 

Also cleaned up source a little bit and eliminated a warning.

Bug: 2964821
Change-Id: I35825bb345742ea1a1854e8998aa67e353deaa17
parent 46733267

core/java/android/net/ProxyProperties.java

+8 −3
Original line number Diff line number Diff line
@@ -41,13 +41,17 @@ public class ProxyProperties implements Parcelable { 
        if (source != null) {

            mProxy = source.getAddress();

            mPort = source.getPort();

            mExclusionList = new String(source.getExclusionList());

            String exclusionList = source.getExclusionList();

            if (exclusionList != null) {

                mExclusionList = new String(exclusionList);

            }

        }

    }



    public InetAddress getAddress() {

        return mProxy;

    }



    public void setAddress(InetAddress proxy) {

        mProxy = proxy;

    }
@@ -55,6 +59,7 @@ public class ProxyProperties implements Parcelable { 
    public int getPort() {

        return mPort;

    }



    public void setPort(int port) {

        mPort = port;

    }
@@ -62,6 +67,7 @@ public class ProxyProperties implements Parcelable { 
    public String getExclusionList() {

        return mExclusionList;

    }



    public void setExclusionList(String exclusionList) {

        mExclusionList = exclusionList;

    }
@@ -121,5 +127,4 @@ public class ProxyProperties implements Parcelable { 
                return new ProxyProperties[size];

            }

        };



};
 
}