diff options
| author | 2015-12-18 15:36:48 -0800 | |
|---|---|---|
| committer | 2016-01-21 10:59:18 -0800 | |
| commit | c90855d7a9f3ebd300de4dad9842cd6771ff27d1 (patch) | |
| tree | 9d4231dd3c42385a13ad75c8eeb5c0abf0d8309e | |
| parent | 599f62562b6102f9e3830d5b32a282d23c59e2fd (diff) | |
Updates for gscan HAL updates in N
This will compile, but all new functionality may not work
Change-Id: I88f27f375121c6b27377b075e9fd6bfad7b05aa4
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/WifiScanner.java | 26 |
2 files changed, 20 insertions, 7 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index c91a9678f1d0..b8df849d4021 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -21203,6 +21203,7 @@ package android.net.wifi { field public static final int REASON_UNSPECIFIED = -1; // 0xffffffff field public static final deprecated 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_CONTEXT_HUB = 8; // 0x8 field public static final int REPORT_EVENT_FULL_SCAN_RESULT = 2; // 0x2 field public static final int REPORT_EVENT_NO_BATCH = 4; // 0x4 field public static final int WIFI_BAND_24_GHZ = 1; // 0x1 diff --git a/wifi/java/android/net/wifi/WifiScanner.java b/wifi/java/android/net/wifi/WifiScanner.java index 76c679ce6b9f..44be671a4309 100644 --- a/wifi/java/android/net/wifi/WifiScanner.java +++ b/wifi/java/android/net/wifi/WifiScanner.java @@ -136,17 +136,29 @@ public class WifiScanner { } } - /** reports {@link ScanListener#onResults} when underlying buffers are full + /** + * reports {@link ScanListener#onResults} when underlying buffers are full + * this is simply the lack of the {@link #REPORT_EVENT_AFTER_EACH_SCAN} flag * @deprecated */ @Deprecated public static final int REPORT_EVENT_AFTER_BUFFER_FULL = 0; - /** reports {@link ScanListener#onResults} after each scan */ - public static final int REPORT_EVENT_AFTER_EACH_SCAN = 1; - /** reports {@link ScanListener#onFullResult} whenever each beacon is discovered */ - public static final int REPORT_EVENT_FULL_SCAN_RESULT = 2; - /** do not batch */ - public static final int REPORT_EVENT_NO_BATCH = 4; + /** + * reports {@link ScanListener#onResults} after each scan + */ + public static final int REPORT_EVENT_AFTER_EACH_SCAN = (1 << 0); + /** + * reports {@link ScanListener#onFullResult} whenever each beacon is discovered + */ + public static final int REPORT_EVENT_FULL_SCAN_RESULT = (1 << 1); + /** + * Do not place scans in the chip's scan history buffer + */ + public static final int REPORT_EVENT_NO_BATCH = (1 << 2); + /** + * report full scan results and completion event to the context hub + */ + public static final int REPORT_EVENT_CONTEXT_HUB = (1 << 3); /** * scan configuration parameters to be sent to {@link #startBackgroundScan} |