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

Commit 41c5bef3 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Wifi: Add a flag to indicate duplicate network"

parents f058bd35 93e90dd0

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

+8 −0
Original line number Original line Diff line number Diff line
@@ -804,6 +804,12 @@ public class WifiConfiguration implements Parcelable { 
     */

     */

    public HashMap<String, Integer>  linkedConfigurations;

    public HashMap<String, Integer>  linkedConfigurations;





    /**

     * @hide

     * Duplicate Wifi Configuration

     */

    public boolean duplicateNetwork;



    public WifiConfiguration() {

    public WifiConfiguration() {

        networkId = INVALID_NETWORK_ID;

        networkId = INVALID_NETWORK_ID;

        SSID = null;

        SSID = null;
@@ -829,6 +835,7 @@ public class WifiConfiguration implements Parcelable { 
        ephemeral = false;

        ephemeral = false;

        noInternetAccess = false;

        noInternetAccess = false;

        mIpConfiguration = new IpConfiguration();

        mIpConfiguration = new IpConfiguration();

        duplicateNetwork = false;

    }

    }





    /**

    /**
@@ -1466,6 +1473,7 @@ public class WifiConfiguration implements Parcelable { 
                    = source.autoJoinUseAggressiveJoinAttemptThreshold;

                    = source.autoJoinUseAggressiveJoinAttemptThreshold;

            autoJoinBailedDueToLowRssi = source.autoJoinBailedDueToLowRssi;

            autoJoinBailedDueToLowRssi = source.autoJoinBailedDueToLowRssi;

            dirty = source.dirty;

            dirty = source.dirty;

            duplicateNetwork = source.duplicateNetwork;

        }

        }

    }

    }