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

Commit 8faf2a2a authored by Jeff Davidson's avatar Jeff Davidson
Browse files

Don't drop WifiConfiguration's ephemeral bit on copy/parcel. 

Bug: 15892711
Change-Id: I4a027c99634a11d13bb3c8420ba959c201644689
parent 00092db1

wifi/java/android/net/wifi/WifiConfiguration.java

+5 −1
Original line number Original line Diff line number Diff line
@@ -941,7 +941,8 @@ public class WifiConfiguration implements Parcelable { 
        if (this.didSelfAdd) sbuf.append(" didSelfAdd");

        if (this.didSelfAdd) sbuf.append(" didSelfAdd");

        if (this.selfAdded) sbuf.append(" selfAdded");

        if (this.selfAdded) sbuf.append(" selfAdded");

        if (this.noInternetAccess) sbuf.append(" noInternetAccess");

        if (this.noInternetAccess) sbuf.append(" noInternetAccess");

        if (this.didSelfAdd || this.selfAdded || this.noInternetAccess) {

        if (this.ephemeral) sbuf.append(" ephemeral");

        if (this.didSelfAdd || this.selfAdded || this.noInternetAccess || this.ephemeral) {

            sbuf.append("\n");

            sbuf.append("\n");

        }

        }

        sbuf.append(" KeyMgmt:");

        sbuf.append(" KeyMgmt:");
@@ -1378,6 +1379,7 @@ public class WifiConfiguration implements Parcelable { 
            autoJoinStatus = source.autoJoinStatus;

            autoJoinStatus = source.autoJoinStatus;

            selfAdded = source.selfAdded;

            selfAdded = source.selfAdded;

            noInternetAccess = source.noInternetAccess;

            noInternetAccess = source.noInternetAccess;

            ephemeral = source.ephemeral;

            if (source.visibility != null) {

            if (source.visibility != null) {

                visibility = new Visibility(source.visibility);

                visibility = new Visibility(source.visibility);

            }

            }
@@ -1454,6 +1456,7 @@ public class WifiConfiguration implements Parcelable { 
        dest.writeInt(selfAdded ? 1 : 0);

        dest.writeInt(selfAdded ? 1 : 0);

        dest.writeInt(didSelfAdd ? 1 : 0);

        dest.writeInt(didSelfAdd ? 1 : 0);

        dest.writeInt(noInternetAccess ? 1 : 0);

        dest.writeInt(noInternetAccess ? 1 : 0);

        dest.writeInt(ephemeral ? 1 : 0);

        dest.writeInt(creatorUid);

        dest.writeInt(creatorUid);

        dest.writeInt(lastConnectUid);

        dest.writeInt(lastConnectUid);

        dest.writeInt(lastUpdateUid);

        dest.writeInt(lastUpdateUid);
@@ -1514,6 +1517,7 @@ public class WifiConfiguration implements Parcelable { 
                config.selfAdded = in.readInt() != 0;

                config.selfAdded = in.readInt() != 0;

                config.didSelfAdd = in.readInt() != 0;

                config.didSelfAdd = in.readInt() != 0;

                config.noInternetAccess = in.readInt() != 0;

                config.noInternetAccess = in.readInt() != 0;

                config.ephemeral = in.readInt() != 0;

                config.creatorUid = in.readInt();

                config.creatorUid = in.readInt();

                config.lastConnectUid = in.readInt();

                config.lastConnectUid = in.readInt();

                config.lastUpdateUid = in.readInt();

                config.lastUpdateUid = in.readInt();