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

Commit b53d1a27 authored by vandwalle's avatar vandwalle Committed by android-build-merger
Browse files

Merge "aggressively blacklist WifiConfiguration for the purpose of switching... 

Merge "aggressively blacklist WifiConfiguration for the purpose of switching network" into lmp-mr1-dev automerge: d1698393 automerge: 0a22d43c
automerge: 7e553a06

* commit '7e553a06':
  aggressively blacklist WifiConfiguration for the purpose of switching network
parents b6f10982 7e553a06

core/res/res/values/config.xml

+4 −0
Original line number Diff line number Diff line
@@ -424,6 +424,10 @@ 
    <!-- Integer indicating wpa_supplicant scan interval in milliseconds -->

    <integer translatable="false" name="config_wifi_supplicant_scan_interval">15000</integer>



    <!-- Integer indicating amount of time failed networks areblacklisted for the purpose

         of network switching in milliseconds -->

    <integer translatable="false" name="config_wifi_network_switching_blacklist_time">172800000</integer>



    <!-- Integer indicating wpa_supplicant scan interval when p2p is connected in milliseconds -->

    <integer translatable="false" name="config_wifi_scan_interval_p2p_connected">60000</integer>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -327,6 +327,7 @@ 
  <java-symbol type="integer" name="config_wifi_framework_scan_result_rssi_level_patchup_value" />

  <java-symbol type="integer" name="config_wifi_framework_current_network_boost" />

  <java-symbol type="string"  name="config_wifi_random_mac_oui" />

  <java-symbol type="integer"  name="config_wifi_network_switching_blacklist_time" />



  <java-symbol type="bool" name="editable_voicemailnumber" />

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

+46 −0
Original line number Diff line number Diff line
@@ -731,6 +731,31 @@ public class WifiConfiguration implements Parcelable { 
     */

    public long lastConnectionFailure;



    /**

     * @hide

     * Last time the system tried to roam and failed because of authentication failure or DHCP

     * RENEW failure.

     */

    public long lastRoamingFailure;



    /** @hide */

    public static int ROAMING_FAILURE_IP_CONFIG = 1;

    /** @hide */

    public static int ROAMING_FAILURE_AUTH_FAILURE = 2;



    /**

     * @hide

     * Initial amount of time this Wifi configuration gets blacklisted for network switching

     * because of roaming failure

     */

    public long roamingFailureBlackListTimeMilli = 1000;



    /**

     * @hide

     * Last roaming failure reason code

     */

    public int lastRoamingFailureReason;



    /**

     * @hide

     * Last time the system was disconnected to this configuration.
@@ -1209,6 +1234,18 @@ public class WifiConfiguration implements Parcelable { 
                sbuf.append( "sec");

            }

        }

        if (this.lastRoamingFailure != 0) {

            sbuf.append('\n');

            long diff = now_ms - this.lastRoamingFailure;

            if (diff <= 0) {

                sbuf.append("lastRoamingFailure since <incorrect>");

            } else {

                sbuf.append("lastRoamingFailure: ").append(Long.toString(diff/1000));

                sbuf.append( "sec");

            }

        }

        sbuf.append("roamingFailureBlackListTimeMilli: ").

                append(Long.toString(this.roamingFailureBlackListTimeMilli));

        sbuf.append('\n');

        if (this.linkedConfigurations != null) {

            for(String key : this.linkedConfigurations.keySet()) {
@@ -1595,6 +1632,9 @@ public class WifiConfiguration implements Parcelable { 
            lastConnected = source.lastConnected;

            lastDisconnected = source.lastDisconnected;

            lastConnectionFailure = source.lastConnectionFailure;

            lastRoamingFailure = source.lastRoamingFailure;

            lastRoamingFailureReason = source.lastRoamingFailureReason;

            roamingFailureBlackListTimeMilli = source.roamingFailureBlackListTimeMilli;

            numConnectionFailures = source.numConnectionFailures;

            numIpConfigFailures = source.numIpConfigFailures;

            numAuthFailures = source.numAuthFailures;
@@ -1667,6 +1707,9 @@ public class WifiConfiguration implements Parcelable { 
        dest.writeString(lastUpdateName);

        dest.writeLong(blackListTimestamp);

        dest.writeLong(lastConnectionFailure);

        dest.writeLong(lastRoamingFailure);

        dest.writeInt(lastRoamingFailureReason);

        dest.writeLong(roamingFailureBlackListTimeMilli);

        dest.writeInt(numConnectionFailures);

        dest.writeInt(numIpConfigFailures);

        dest.writeInt(numAuthFailures);
@@ -1732,6 +1775,9 @@ public class WifiConfiguration implements Parcelable { 
                config.lastUpdateName = in.readString();

                config.blackListTimestamp = in.readLong();

                config.lastConnectionFailure = in.readLong();

                config.lastRoamingFailure = in.readLong();

                config.lastRoamingFailureReason = in.readInt();

                config.roamingFailureBlackListTimeMilli = in.readLong();

                config.numConnectionFailures = in.readInt();

                config.numIpConfigFailures = in.readInt();

                config.numAuthFailures = in.readInt();