1 files changed, 9 insertions, 2 deletions
diff --git a/wifi/java/android/net/wifi/WifiScanner.java b/wifi/java/android/net/wifi/WifiScanner.java
index 21b700d..f3294bb 100644
--- a/wifi/java/android/net/wifi/WifiScanner.java
+++ b/wifi/java/android/net/wifi/WifiScanner.java
@@ -16,6 +16,7 @@
 
 package android.net.wifi;
 
+import android.annotation.SystemApi;
 import android.content.Context;
 import android.os.Handler;
 import android.os.HandlerThread;
@@ -42,6 +43,7 @@ import java.util.concurrent.CountDownLatch;
  * .WIFI_SCANNING_SERVICE)}.
  * @hide
  */
+@SystemApi
 public class WifiScanner {
 
     /** no band specified; use channel list instead */
@@ -61,7 +63,7 @@ public class WifiScanner {
     public static final int WIFI_BAND_BOTH_WITH_DFS = 7;    /* both bands with DFS channels */
 
     /** Minimum supported scanning period */
-    public static final int MIN_SCAN_PERIOD_MS = 2000;      /* minimum supported period */
+    public static final int MIN_SCAN_PERIOD_MS = 1000;      /* minimum supported period */
     /** Maximum supported scanning period */
     public static final int MAX_SCAN_PERIOD_MS = 1024000;   /* maximum supported period */
 
@@ -78,6 +80,7 @@ public class WifiScanner {
      * Generic action callback invocation interface
      *  @hide
      */
+    @SystemApi
     public static interface ActionListener {
         public void onSuccess();
         public void onFailure(int reason, String description);
@@ -138,7 +141,7 @@ public class WifiScanner {
         public int band;
         /** list of channels; used when band is set to WIFI_BAND_UNSPECIFIED */
         public ChannelSpec[] channels;
-        /** period of background scan; in millisecond */
+        /** period of background scan; in millisecond, 0 => single shot scan */
         public int periodInMs;
         /** must have a valid REPORT_EVENT value */
         public int reportEvents;
@@ -267,6 +270,7 @@ public class WifiScanner {
     /** @hide */
     public void scan(ScanSettings settings, ScanListener listener) {
         validateChannel();
+        settings.periodInMs = 0;
         sAsyncChannel.sendMessage(CMD_SCAN, 0, putListener(listener), settings);
     }
 
@@ -313,6 +317,7 @@ public class WifiScanner {
     }
 
     /** @hide */
+    @SystemApi
     public static class WifiChangeSettings implements Parcelable {
         public int rssiSampleSize;                          /* sample size for RSSI averaging */
         public int lostApSampleSize;                        /* samples to confirm AP's loss */
@@ -443,6 +448,7 @@ public class WifiScanner {
     }
 
     /** @hide */
+    @SystemApi
     public void configureWifiChange(WifiChangeSettings settings) {
         validateChannel();
         sAsyncChannel.sendMessage(CMD_CONFIGURE_WIFI_CHANGE, 0, 0, settings);
@@ -457,6 +463,7 @@ public class WifiScanner {
     }
 
     /** @hide */
+    @SystemApi
     public static class HotlistSettings implements Parcelable {
         public HotspotInfo[] hotspotInfos;
         public int apLostThreshold;