Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "per bssid blacklist" into lmp-dev

Browse Source
This commit is contained in:
vandwalle
2014-08-21 14:55:10 +00:00
committed by Android (Google) Code Review
parent 94f6878bbd 612519db40
commit beec21522d
1 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
wifi/java/android/net/wifi/ScanResult.java
View File

@@ -106,7 +106,24 @@ public class ScanResult implements Parcelable {
* Status: indicating join status
* @hide
*/
public int status;
public int autoJoinStatus;
/**
* @hide
* Last time we blacklisted the ScanResult
*/
public long blackListTimestamp;
/** @hide **/
public void setAutoJoinStatus(int status) {
if (status < 0) status = 0;
if (status == 0) {
blackListTimestamp = 0;
} else if (status > autoJoinStatus) {
blackListTimestamp = System.currentTimeMillis();
}
autoJoinStatus = status;
}
/**
* Status: indicating the scan result is not a result
@@ -244,7 +261,7 @@ public class ScanResult implements Parcelable {
distanceSdCm = source.distanceSdCm;
seen = source.seen;
passpoint = source.passpoint;
status = source.status;
autoJoinStatus = source.autoJoinStatus;
untrusted = source.untrusted;
numConnection = source.numConnection;
numUsage = source.numUsage;
@@ -282,8 +299,8 @@ public class ScanResult implements Parcelable {
append("(cm)");
sb.append(", passpoint: ").append(passpoint != null ? "yes" : "no");
if (status != 0) {
sb.append(", status: ").append(status);
if (autoJoinStatus != 0) {
sb.append(", status: ").append(autoJoinStatus);
}
return sb.toString();
}
@@ -309,7 +326,7 @@ public class ScanResult implements Parcelable {
dest.writeInt(distanceCm);
dest.writeInt(distanceSdCm);
dest.writeLong(seen);
dest.writeInt(status);
dest.writeInt(autoJoinStatus);
dest.writeInt(untrusted ? 1 : 0);
dest.writeInt(numConnection);
dest.writeInt(numUsage);
@@ -350,7 +367,7 @@ public class ScanResult implements Parcelable {
in.readInt()
);
sr.seen = in.readLong();
sr.status = in.readInt();
sr.autoJoinStatus = in.readInt();
sr.untrusted = in.readInt() != 0;
sr.numConnection = in.readInt();
sr.numUsage = in.readInt();