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

Merge "Add bucketsScanned to ScanData" into nyc-dev

Browse Source 
am: fb2d2ce

* commit 'fb2d2cec7b6bb5412414b50f60b7b7bb0c67af76':
  Add bucketsScanned to ScanData
This commit is contained in:
Mitchell Wills
2016-03-25 20:32:25 +00:00
committed by android-build-merger
parent 96192ce397 fb2d2cec7b
commit 673e919ab8
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
wifi/java/android/net/wifi/WifiScanner.java
View File

@@ -277,6 +277,12 @@ public class WifiScanner {
* non-zero => scan was truncated, so results may not be complete * non-zero => scan was truncated, so results may not be complete
*/ */
private int mFlags; private int mFlags;
/**
* Indicates the buckets that were scanned to generate these results.
* This is not relevant to WifiScanner API users and is used internally.
* {@hide}
*/
private int mBucketsScanned;
/** all scan results discovered in this scan, sorted by timestamp in ascending order */ /** all scan results discovered in this scan, sorted by timestamp in ascending order */
private ScanResult mResults[]; private ScanResult mResults[];
@@ -288,9 +294,18 @@ public class WifiScanner {
mResults = results; mResults = results;
} }
/** {@hide} */
public ScanData(int id, int flags, int bucketsScanned, ScanResult[] results) {
mId = id;
mFlags = flags;
mBucketsScanned = bucketsScanned;
mResults = results;
}
public ScanData(ScanData s) { public ScanData(ScanData s) {
mId = s.mId; mId = s.mId;
mFlags = s.mFlags; mFlags = s.mFlags;
mBucketsScanned = s.mBucketsScanned;
mResults = new ScanResult[s.mResults.length]; mResults = new ScanResult[s.mResults.length];
for (int i = 0; i < s.mResults.length; i++) { for (int i = 0; i < s.mResults.length; i++) {
ScanResult result = s.mResults[i]; ScanResult result = s.mResults[i];
@@ -321,6 +336,7 @@ public class WifiScanner {
if (mResults != null) { if (mResults != null) {
dest.writeInt(mId); dest.writeInt(mId);
dest.writeInt(mFlags); dest.writeInt(mFlags);
dest.writeInt(mBucketsScanned);
dest.writeInt(mResults.length); dest.writeInt(mResults.length);
for (int i = 0; i < mResults.length; i++) { for (int i = 0; i < mResults.length; i++) {
ScanResult result = mResults[i]; ScanResult result = mResults[i];
@@ -337,12 +353,13 @@ public class WifiScanner {
public ScanData createFromParcel(Parcel in) { public ScanData createFromParcel(Parcel in) {
int id = in.readInt(); int id = in.readInt();
int flags = in.readInt(); int flags = in.readInt();
int bucketsScanned = in.readInt();
int n = in.readInt(); int n = in.readInt();
ScanResult results[] = new ScanResult[n]; ScanResult results[] = new ScanResult[n];
for (int i = 0; i < n; i++) { for (int i = 0; i < n; i++) {
results[i] = ScanResult.CREATOR.createFromParcel(in); results[i] = ScanResult.CREATOR.createFromParcel(in);
} }
return new ScanData(id, flags, results); return new ScanData(id, flags, bucketsScanned, results);
} }
public ScanData[] newArray(int size) { public ScanData[] newArray(int size) {