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

Commit 612519db authored by vandwalle's avatar vandwalle Committed by Pierre Vandwalle
Browse files

per bssid blacklist 

Bug: 16823537

This CL is dependent on Iff32fae2cd67343e63046d58d75fa1e10d9775d0

Change-Id: Id9411c8097337b37ac1ce1a6ac8b28b4bda31ff3
parent da3475db

wifi/java/android/net/wifi/ScanResult.java

+23 −6
Original line number Diff line number Diff line
@@ -103,7 +103,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
@@ -241,7 +258,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;
@@ -279,8 +296,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();

    }
@@ -306,7 +323,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);
@@ -347,7 +364,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();