am 7f3c9eec: Merge "Read/Write numBssidsPerScan in ParcelableScanResults" into lmp-dev

* commit '7f3c9eec439a0e958d7d5427a4e57bfc702d96a6':
  Read/Write numBssidsPerScan in ParcelableScanResults
This commit is contained in:
Vinit Deshpande
2014-08-08 00:11:19 +00:00
committed by Android Git Automerger

View File

@@ -100,7 +100,7 @@ public class WifiScanner {
*/
public static class ChannelSpec {
/**
* channel frequency in KHz; for example channel 1 is specified as 2412
* channel frequency in MHz; for example channel 1 is specified as 2412
*/
public int frequency;
/**
@@ -158,6 +158,7 @@ public class WifiScanner {
dest.writeInt(band);
dest.writeInt(periodInMs);
dest.writeInt(reportEvents);
dest.writeInt(numBssidsPerScan);
if (channels != null) {
dest.writeInt(channels.length);
@@ -181,6 +182,7 @@ public class WifiScanner {
settings.band = in.readInt();
settings.periodInMs = in.readInt();
settings.reportEvents = in.readInt();
settings.numBssidsPerScan = in.readInt();
int num_channels = in.readInt();
settings.channels = new ChannelSpec[num_channels];
for (int i = 0; i < num_channels; i++) {