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

Commit ef6c1431 authored by Irfan Sheriff's avatar Irfan Sheriff
Browse files

Fix reboot loop due to NPE 

Bug: 2962059
Change-Id: I73d5fa5ef0f29dc139c843b34f58f189c94dfe4b
parent 224744cc

core/java/android/net/LinkProperties.java

+7 −5
Original line number Diff line number Diff line
@@ -48,12 +48,14 @@ public class LinkProperties implements Parcelable { 


    // copy constructor instead of clone

    public LinkProperties(LinkProperties source) {

        if (source != null) {

            mIface = source.getInterface();

            mAddresses = source.getAddresses();

            mDnses = source.getDnses();

            mGateway = source.getGateway();

            mHttpProxy = new ProxyProperties(source.getHttpProxy());

        }

    }



    public void setInterface(NetworkInterface iface) {

        mIface = iface;

core/java/android/net/ProxyProperties.java

+5 −3
Original line number Diff line number Diff line
@@ -38,10 +38,12 @@ public class ProxyProperties implements Parcelable { 


    // copy constructor instead of clone

    public ProxyProperties(ProxyProperties source) {

        if (source != null) {

            mProxy = source.getAddress();

            mPort = source.getPort();

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

        }

    }



    public InetAddress getAddress() {

        return mProxy;