Unhide the WifiScanner API

This change also adds java docs where needed.

Change-Id: I1b7e56e31d460bc773dab9603fbebacf7c439e60

1 files changed, 77 insertions, 0 deletions

diff --git a/api/current.txt b/api/current.txt
index b16eb2f..94b304a 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -16824,6 +16824,83 @@ package android.net.wifi {
     method public void setWorkSource(android.os.WorkSource);
   }
 
+  public class WifiScanner {
+    method public void configureWifiChange(int, int, int, int, android.net.wifi.WifiScanner.HotspotInfo[]);
+    method public void resetHotlist(android.net.wifi.WifiScanner.HotlistListener);
+    method public void retrieveScanResults(boolean, android.net.wifi.WifiScanner.ScanListener);
+    method public void setHotlist(android.net.wifi.WifiScanner.HotspotInfo[], int, android.net.wifi.WifiScanner.HotlistListener);
+    method public void startBackgroundScan(android.net.wifi.WifiScanner.ScanSettings, android.net.wifi.WifiScanner.ScanListener);
+    method public void startTrackingWifiChange(android.net.wifi.WifiScanner.WifiChangeListener);
+    method public void stopBackgroundScan(android.net.wifi.WifiScanner.ScanListener);
+    method public void stopTrackingWifiChange(android.net.wifi.WifiScanner.WifiChangeListener);
+    field public static final int MAX_SCAN_PERIOD_MS = 1024000; // 0xfa000
+    field public static final int MIN_SCAN_PERIOD_MS = 2000; // 0x7d0
+    field public static final int REASON_CONFLICTING_REQUEST = -4; // 0xfffffffc
+    field public static final int REASON_INVALID_LISTENER = -2; // 0xfffffffe
+    field public static final int REASON_INVALID_REQUEST = -3; // 0xfffffffd
+    field public static final int REASON_SUCCEEDED = 0; // 0x0
+    field public static final int REASON_UNSPECIFIED = -1; // 0xffffffff
+    field public static final int REPORT_EVENT_AFTER_BUFFER_FULL = 0; // 0x0
+    field public static final int REPORT_EVENT_AFTER_EACH_SCAN = 1; // 0x1
+    field public static final int REPORT_EVENT_FULL_SCAN_RESULT = 2; // 0x2
+    field public static final int WIFI_BAND_24_GHZ = 1; // 0x1
+    field public static final int WIFI_BAND_5_GHZ = 2; // 0x2
+    field public static final int WIFI_BAND_5_GHZ_DFS_ONLY = 4; // 0x4
+    field public static final int WIFI_BAND_5_GHZ_WITH_DFS = 6; // 0x6
+    field public static final int WIFI_BAND_BOTH = 3; // 0x3
+    field public static final int WIFI_BAND_BOTH_WITH_DFS = 7; // 0x7
+    field public static final int WIFI_BAND_UNSPECIFIED = 0; // 0x0
+  }
+
+  public static class WifiScanner.ChannelSpec {
+    ctor public WifiScanner.ChannelSpec(int);
+    field public int frequency;
+  }
+
+  public static class WifiScanner.FullScanResult {
+    ctor public WifiScanner.FullScanResult();
+    field public android.net.wifi.WifiScanner.InformationElement[] informationElements;
+    field public android.net.wifi.ScanResult result;
+  }
+
+  public static abstract interface WifiScanner.HotlistListener {
+    method public abstract void onFound(android.net.wifi.ScanResult[]);
+  }
+
+  public static class WifiScanner.HotspotInfo {
+    ctor public WifiScanner.HotspotInfo();
+    field public java.lang.String bssid;
+    field public int high;
+    field public int low;
+  }
+
+  public static class WifiScanner.InformationElement {
+    ctor public WifiScanner.InformationElement();
+    field public byte[] bytes;
+    field public int id;
+  }
+
+  public static abstract interface WifiScanner.ScanListener {
+    method public abstract void onFullResult(android.net.wifi.WifiScanner.FullScanResult);
+    method public abstract void onPeriodChanged(int);
+    method public abstract void onResults(android.net.wifi.ScanResult[]);
+  }
+
+  public static class WifiScanner.ScanSettings implements android.os.Parcelable {
+    ctor public WifiScanner.ScanSettings();
+    method public int describeContents();
+    method public void writeToParcel(android.os.Parcel, int);
+    field public int band;
+    field public android.net.wifi.WifiScanner.ChannelSpec[] channels;
+    field public int periodInMs;
+    field public int reportEvents;
+  }
+
+  public static abstract interface WifiScanner.WifiChangeListener {
+    method public abstract void onChanging(android.net.wifi.ScanResult[]);
+    method public abstract void onQuiescence(android.net.wifi.ScanResult[]);
+  }
+
   public class WpsInfo implements android.os.Parcelable {
     ctor public WpsInfo();
     ctor public WpsInfo(android.net.wifi.WpsInfo);