Merge "aggressively blacklist WifiConfiguration for the purpose of switching network" into lmp-mr1-dev
This commit is contained in:
@ -424,6 +424,10 @@
|
|||||||
<!-- Integer indicating wpa_supplicant scan interval in milliseconds -->
|
<!-- Integer indicating wpa_supplicant scan interval in milliseconds -->
|
||||||
<integer translatable="false" name="config_wifi_supplicant_scan_interval">15000</integer>
|
<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 indicating wpa_supplicant scan interval when p2p is connected in milliseconds -->
|
||||||
<integer translatable="false" name="config_wifi_scan_interval_p2p_connected">60000</integer>
|
<integer translatable="false" name="config_wifi_scan_interval_p2p_connected">60000</integer>
|
||||||
|
|
||||||
|
@ -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_scan_result_rssi_level_patchup_value" />
|
||||||
<java-symbol type="integer" name="config_wifi_framework_current_network_boost" />
|
<java-symbol type="integer" name="config_wifi_framework_current_network_boost" />
|
||||||
<java-symbol type="string" name="config_wifi_random_mac_oui" />
|
<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" />
|
<java-symbol type="bool" name="editable_voicemailnumber" />
|
||||||
|
|
||||||
|
@ -686,6 +686,31 @@ public class WifiConfiguration implements Parcelable {
|
|||||||
*/
|
*/
|
||||||
public long lastConnectionFailure;
|
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
|
* @hide
|
||||||
* Last time the system was disconnected to this configuration.
|
* Last time the system was disconnected to this configuration.
|
||||||
@ -1148,6 +1173,18 @@ public class WifiConfiguration implements Parcelable {
|
|||||||
sbuf.append( "sec");
|
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');
|
sbuf.append('\n');
|
||||||
if (this.linkedConfigurations != null) {
|
if (this.linkedConfigurations != null) {
|
||||||
for(String key : this.linkedConfigurations.keySet()) {
|
for(String key : this.linkedConfigurations.keySet()) {
|
||||||
@ -1518,6 +1555,9 @@ public class WifiConfiguration implements Parcelable {
|
|||||||
lastConnected = source.lastConnected;
|
lastConnected = source.lastConnected;
|
||||||
lastDisconnected = source.lastDisconnected;
|
lastDisconnected = source.lastDisconnected;
|
||||||
lastConnectionFailure = source.lastConnectionFailure;
|
lastConnectionFailure = source.lastConnectionFailure;
|
||||||
|
lastRoamingFailure = source.lastRoamingFailure;
|
||||||
|
lastRoamingFailureReason = source.lastRoamingFailureReason;
|
||||||
|
roamingFailureBlackListTimeMilli = source.roamingFailureBlackListTimeMilli;
|
||||||
numConnectionFailures = source.numConnectionFailures;
|
numConnectionFailures = source.numConnectionFailures;
|
||||||
numIpConfigFailures = source.numIpConfigFailures;
|
numIpConfigFailures = source.numIpConfigFailures;
|
||||||
numAuthFailures = source.numAuthFailures;
|
numAuthFailures = source.numAuthFailures;
|
||||||
@ -1587,6 +1627,9 @@ public class WifiConfiguration implements Parcelable {
|
|||||||
dest.writeInt(lastUpdateUid);
|
dest.writeInt(lastUpdateUid);
|
||||||
dest.writeLong(blackListTimestamp);
|
dest.writeLong(blackListTimestamp);
|
||||||
dest.writeLong(lastConnectionFailure);
|
dest.writeLong(lastConnectionFailure);
|
||||||
|
dest.writeLong(lastRoamingFailure);
|
||||||
|
dest.writeInt(lastRoamingFailureReason);
|
||||||
|
dest.writeLong(roamingFailureBlackListTimeMilli);
|
||||||
dest.writeInt(numConnectionFailures);
|
dest.writeInt(numConnectionFailures);
|
||||||
dest.writeInt(numIpConfigFailures);
|
dest.writeInt(numIpConfigFailures);
|
||||||
dest.writeInt(numAuthFailures);
|
dest.writeInt(numAuthFailures);
|
||||||
@ -1649,6 +1692,9 @@ public class WifiConfiguration implements Parcelable {
|
|||||||
config.lastUpdateUid = in.readInt();
|
config.lastUpdateUid = in.readInt();
|
||||||
config.blackListTimestamp = in.readLong();
|
config.blackListTimestamp = in.readLong();
|
||||||
config.lastConnectionFailure = in.readLong();
|
config.lastConnectionFailure = in.readLong();
|
||||||
|
config.lastRoamingFailure = in.readLong();
|
||||||
|
config.lastRoamingFailureReason = in.readInt();
|
||||||
|
config.roamingFailureBlackListTimeMilli = in.readLong();
|
||||||
config.numConnectionFailures = in.readInt();
|
config.numConnectionFailures = in.readInt();
|
||||||
config.numIpConfigFailures = in.readInt();
|
config.numIpConfigFailures = in.readInt();
|
||||||
config.numAuthFailures = in.readInt();
|
config.numAuthFailures = in.readInt();
|
||||||
|
Reference in New Issue
Block a user