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

Merge "Remove the obsoleted ScanResult.isAutoJoinCandidate"

Browse Source
This commit is contained in:
Randy Pan
2016-09-30 17:30:15 +00:00
committed by Gerrit Code Review
parent c60c70dcf9 634d97add8
commit 673b47f234
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -138,12 +138,6 @@ public class ScanResult implements Parcelable {
*/ */
public long seen; public long seen;
/**
* If the scan result is a valid autojoin candidate
* {@hide}
*/
public int isAutoJoinCandidate;
/** /**
* @hide * @hide
* Update RSSI of the scan result * Update RSSI of the scan result
@@ -452,7 +446,6 @@ public class ScanResult implements Parcelable {
numConnection = source.numConnection; numConnection = source.numConnection;
numUsage = source.numUsage; numUsage = source.numUsage;
numIpConfigFailures = source.numIpConfigFailures; numIpConfigFailures = source.numIpConfigFailures;
isAutoJoinCandidate = source.isAutoJoinCandidate;
venueName = source.venueName; venueName = source.venueName;
operatorFriendlyName = source.operatorFriendlyName; operatorFriendlyName = source.operatorFriendlyName;
flags = source.flags; flags = source.flags;
@@ -530,7 +523,6 @@ public class ScanResult implements Parcelable {
dest.writeInt(numConnection); dest.writeInt(numConnection);
dest.writeInt(numUsage); dest.writeInt(numUsage);
dest.writeInt(numIpConfigFailures); dest.writeInt(numIpConfigFailures);
dest.writeInt(isAutoJoinCandidate);
dest.writeString((venueName != null) ? venueName.toString() : ""); dest.writeString((venueName != null) ? venueName.toString() : "");
dest.writeString((operatorFriendlyName != null) ? operatorFriendlyName.toString() : ""); dest.writeString((operatorFriendlyName != null) ? operatorFriendlyName.toString() : "");
dest.writeLong(this.flags); dest.writeLong(this.flags);
@@ -600,7 +592,6 @@ public class ScanResult implements Parcelable {
sr.numConnection = in.readInt(); sr.numConnection = in.readInt();
sr.numUsage = in.readInt(); sr.numUsage = in.readInt();
sr.numIpConfigFailures = in.readInt(); sr.numIpConfigFailures = in.readInt();
sr.isAutoJoinCandidate = in.readInt();
sr.venueName = in.readString(); sr.venueName = in.readString();
sr.operatorFriendlyName = in.readString(); sr.operatorFriendlyName = in.readString();
sr.flags = in.readLong(); sr.flags = in.readLong();