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

Merge "Add WifiScanner API that accepts a WorkSource for scans" into nyc-dev

Browse Source
This commit is contained in:
Mitchell Wills
2016-03-30 18:43:22 +00:00
committed by Android (Google) Code Review
parent 1bd064f04b d24427fabd
commit 133240f565
2 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/system-current.txt
View File

@@ -26819,7 +26819,9 @@ package android.net.wifi {
method public void configureWifiChange(android.net.wifi.WifiScanner.WifiChangeSettings); method public void configureWifiChange(android.net.wifi.WifiScanner.WifiChangeSettings);
method public boolean getScanResults(); method public boolean getScanResults();
method public void startBackgroundScan(android.net.wifi.WifiScanner.ScanSettings, android.net.wifi.WifiScanner.ScanListener); method public void startBackgroundScan(android.net.wifi.WifiScanner.ScanSettings, android.net.wifi.WifiScanner.ScanListener);
method public void startBackgroundScan(android.net.wifi.WifiScanner.ScanSettings, android.net.wifi.WifiScanner.ScanListener, android.os.WorkSource);
method public void startScan(android.net.wifi.WifiScanner.ScanSettings, android.net.wifi.WifiScanner.ScanListener); method public void startScan(android.net.wifi.WifiScanner.ScanSettings, android.net.wifi.WifiScanner.ScanListener);
method public void startScan(android.net.wifi.WifiScanner.ScanSettings, android.net.wifi.WifiScanner.ScanListener, android.os.WorkSource);
method public void startTrackingBssids(android.net.wifi.WifiScanner.BssidInfo[], int, android.net.wifi.WifiScanner.BssidListener); method public void startTrackingBssids(android.net.wifi.WifiScanner.BssidInfo[], int, android.net.wifi.WifiScanner.BssidListener);
method public void startTrackingWifiChange(android.net.wifi.WifiScanner.WifiChangeListener); method public void startTrackingWifiChange(android.net.wifi.WifiScanner.WifiChangeListener);
method public void stopBackgroundScan(android.net.wifi.WifiScanner.ScanListener); method public void stopBackgroundScan(android.net.wifi.WifiScanner.ScanListener);

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

@@ -27,6 +27,7 @@ import android.os.Messenger;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.WorkSource;
import android.util.Log; import android.util.Log;
import android.util.SparseArray; import android.util.SparseArray;
@@ -661,12 +662,26 @@ public class WifiScanner {
* scans should also not share this object. * scans should also not share this object.
*/ */
public void startBackgroundScan(ScanSettings settings, ScanListener listener) { public void startBackgroundScan(ScanSettings settings, ScanListener listener) {
startBackgroundScan(settings, listener, null);
}
/** start wifi scan in background
* @param settings specifies various parameters for the scan; for more information look at
* {@link ScanSettings}
* @param workSource WorkSource to blame for power usage
* @param listener specifies the object to report events to. This object is also treated as a
* key for this scan, and must also be specified to cancel the scan. Multiple
* scans should also not share this object.
*/
public void startBackgroundScan(ScanSettings settings, ScanListener listener,
WorkSource workSource) {
Preconditions.checkNotNull(listener, "listener cannot be null"); Preconditions.checkNotNull(listener, "listener cannot be null");
int key = addListener(listener); int key = addListener(listener);
if (key == INVALID_KEY) return; if (key == INVALID_KEY) return;
validateChannel(); validateChannel();
sAsyncChannel.sendMessage(CMD_START_BACKGROUND_SCAN, 0, key, settings); sAsyncChannel.sendMessage(CMD_START_BACKGROUND_SCAN, 0, key, settings);
} }
/** /**
* stop an ongoing wifi scan * stop an ongoing wifi scan
* @param listener specifies which scan to cancel; must be same object as passed in {@link * @param listener specifies which scan to cancel; must be same object as passed in {@link
@@ -698,6 +713,19 @@ public class WifiScanner {
* scans should also not share this object. * scans should also not share this object.
*/ */
public void startScan(ScanSettings settings, ScanListener listener) { public void startScan(ScanSettings settings, ScanListener listener) {
startScan(settings, listener, null);
}
/**
* starts a single scan and reports results asynchronously
* @param settings specifies various parameters for the scan; for more information look at
* {@link ScanSettings}
* @param workSource WorkSource to blame for power usage
* @param listener specifies the object to report events to. This object is also treated as a
* key for this scan, and must also be specified to cancel the scan. Multiple
* scans should also not share this object.
*/
public void startScan(ScanSettings settings, ScanListener listener, WorkSource workSource) {
Preconditions.checkNotNull(listener, "listener cannot be null"); Preconditions.checkNotNull(listener, "listener cannot be null");
int key = addListener(listener); int key = addListener(listener);
if (key == INVALID_KEY) return; if (key == INVALID_KEY) return;