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

Commit 8f41a28f authored by Randy Pan's avatar Randy Pan Committed by android-build-merger
Browse files

Merge "Remove the obsoleted ScanResult.isAutoJoinCandidate" am: 673b47f2 am: 63224d9e 

am: 3629b4ed

Change-Id: I2b148d84b278c92f2a1f0b12f9ca2ff231b4602c
parents ccb5f840 3629b4ed

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

+0 −9
Original line number Diff line number Diff line
@@ -138,12 +138,6 @@ public class ScanResult implements Parcelable { 
     */

    public long seen;



    /**

     * If the scan result is a valid autojoin candidate

     * {@hide}

     */

    public int isAutoJoinCandidate;



    /**

     * @hide

     * Update RSSI of the scan result
@@ -452,7 +446,6 @@ public class ScanResult implements Parcelable { 
            numConnection = source.numConnection;

            numUsage = source.numUsage;

            numIpConfigFailures = source.numIpConfigFailures;

            isAutoJoinCandidate = source.isAutoJoinCandidate;

            venueName = source.venueName;

            operatorFriendlyName = source.operatorFriendlyName;

            flags = source.flags;
@@ -530,7 +523,6 @@ public class ScanResult implements Parcelable { 
        dest.writeInt(numConnection);

        dest.writeInt(numUsage);

        dest.writeInt(numIpConfigFailures);

        dest.writeInt(isAutoJoinCandidate);

        dest.writeString((venueName != null) ? venueName.toString() : "");

        dest.writeString((operatorFriendlyName != null) ? operatorFriendlyName.toString() : "");

        dest.writeLong(this.flags);
@@ -600,7 +592,6 @@ public class ScanResult implements Parcelable { 
                sr.numConnection = in.readInt();

                sr.numUsage = in.readInt();

                sr.numIpConfigFailures = in.readInt();

                sr.isAutoJoinCandidate = in.readInt();

                sr.venueName = in.readString();

                sr.operatorFriendlyName = in.readString();

                sr.flags = in.readLong();