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

Merge "WifiScanner: Add hidden networkIds in scan setting" into mm-wireless-dev

Browse Source 
am: d412376ca0

* commit 'd412376ca00545857df7a21829e3f674253c0567':
  WifiScanner: Add hidden networkIds in scan setting
This commit is contained in:
Roshan Pius
2016-03-07 22:47:59 +00:00
committed by android-build-merger
parent dcbd782635 d412376ca0
commit 4e7ad35b2f
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -169,6 +169,13 @@ public class WifiScanner {
public int band; public int band;
/** list of channels; used when band is set to WIFI_BAND_UNSPECIFIED */ /** list of channels; used when band is set to WIFI_BAND_UNSPECIFIED */
public ChannelSpec[] channels; public ChannelSpec[] channels;
/**
* list of networkId's of hidden networks to scan for.
* These Id's should correspond to the wpa_supplicant's networkId's and will be used
* in connectivity scans using wpa_supplicant.
* {@hide}
* */
public int[] hiddenNetworkIds;
/** period of background scan; in millisecond, 0 => single shot scan */ /** period of background scan; in millisecond, 0 => single shot scan */
public int periodInMs; public int periodInMs;
/** must have a valid REPORT_EVENT value */ /** must have a valid REPORT_EVENT value */
@@ -213,10 +220,8 @@ public class WifiScanner {
dest.writeInt(maxPeriodInMs); dest.writeInt(maxPeriodInMs);
dest.writeInt(stepCount); dest.writeInt(stepCount);
dest.writeInt(isPnoScan ? 1 : 0); dest.writeInt(isPnoScan ? 1 : 0);
if (channels != null) { if (channels != null) {
dest.writeInt(channels.length); dest.writeInt(channels.length);
for (int i = 0; i < channels.length; i++) { for (int i = 0; i < channels.length; i++) {
dest.writeInt(channels[i].frequency); dest.writeInt(channels[i].frequency);
dest.writeInt(channels[i].dwellTimeMS); dest.writeInt(channels[i].dwellTimeMS);
@@ -225,13 +230,13 @@ public class WifiScanner {
} else { } else {
dest.writeInt(0); dest.writeInt(0);
} }
dest.writeIntArray(hiddenNetworkIds);
} }
/** Implement the Parcelable interface {@hide} */ /** Implement the Parcelable interface {@hide} */
public static final Creator<ScanSettings> CREATOR = public static final Creator<ScanSettings> CREATOR =
new Creator<ScanSettings>() { new Creator<ScanSettings>() {
public ScanSettings createFromParcel(Parcel in) { public ScanSettings createFromParcel(Parcel in) {
ScanSettings settings = new ScanSettings(); ScanSettings settings = new ScanSettings();
settings.band = in.readInt(); settings.band = in.readInt();
settings.periodInMs = in.readInt(); settings.periodInMs = in.readInt();
@@ -245,13 +250,12 @@ public class WifiScanner {
settings.channels = new ChannelSpec[num_channels]; settings.channels = new ChannelSpec[num_channels];
for (int i = 0; i < num_channels; i++) { for (int i = 0; i < num_channels; i++) {
int frequency = in.readInt(); int frequency = in.readInt();
ChannelSpec spec = new ChannelSpec(frequency); ChannelSpec spec = new ChannelSpec(frequency);
spec.dwellTimeMS = in.readInt(); spec.dwellTimeMS = in.readInt();
spec.passive = in.readInt() == 1; spec.passive = in.readInt() == 1;
settings.channels[i] = spec; settings.channels[i] = spec;
} }
settings.hiddenNetworkIds = in.createIntArray();
return settings; return settings;
} }