diff options
| author | Michael Plass <mplass@google.com> | 2017-03-15 19:00:09 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-15 19:00:09 +0000 |
| commit | 53aa2cc5f30cf53c73324a4629b404d49023a0dc (patch) | |
| tree | e5411b9280de1fc5c959f85a43600df4bb29e889 /service/java/com/android/server/wifi/scanner | |
| parent | a6c9196ab06177459471e7307415802ebb8fcafb (diff) | |
| parent | 1eef091776285e33777b3e6d9337c21330a17a2f (diff) | |
| download | android_frameworks_opt_net_wifi-53aa2cc5f30cf53c73324a4629b404d49023a0dc.tar.gz android_frameworks_opt_net_wifi-53aa2cc5f30cf53c73324a4629b404d49023a0dc.tar.bz2 android_frameworks_opt_net_wifi-53aa2cc5f30cf53c73324a4629b404d49023a0dc.zip | |
Merge "BgScan rename for wifi vendor background scan" am: f66217fc1b am: 5af7cdd3d8
am: 1eef091776
Change-Id: I2d97934b64dec3c733a3f2528e5b1be210501d4d
Diffstat (limited to 'service/java/com/android/server/wifi/scanner')
| -rw-r--r-- | service/java/com/android/server/wifi/scanner/HalWifiScannerImpl.java | 12 | ||||
| -rw-r--r-- | service/java/com/android/server/wifi/scanner/WifiScannerImpl.java | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/service/java/com/android/server/wifi/scanner/HalWifiScannerImpl.java b/service/java/com/android/server/wifi/scanner/HalWifiScannerImpl.java index 95528e252..3fb491ae5 100644 --- a/service/java/com/android/server/wifi/scanner/HalWifiScannerImpl.java +++ b/service/java/com/android/server/wifi/scanner/HalWifiScannerImpl.java @@ -66,7 +66,7 @@ public class HalWifiScannerImpl extends WifiScannerImpl implements Handler.Callb @Override public boolean getScanCapabilities(WifiNative.ScanCapabilities capabilities) { - return mWifiNative.getScanCapabilities(capabilities); + return mWifiNative.getBgScanCapabilities(capabilities); } @Override @@ -92,27 +92,27 @@ public class HalWifiScannerImpl extends WifiScannerImpl implements Handler.Callb + ",eventHandler=" + eventHandler); return false; } - return mWifiNative.startScan(settings, eventHandler); + return mWifiNative.startBgScan(settings, eventHandler); } @Override public void stopBatchedScan() { - mWifiNative.stopScan(); + mWifiNative.stopBgScan(); } @Override public void pauseBatchedScan() { - mWifiNative.pauseScan(); + mWifiNative.pauseBgScan(); } @Override public void restartBatchedScan() { - mWifiNative.restartScan(); + mWifiNative.restartBgScan(); } @Override public WifiScanner.ScanData[] getLatestBatchedScanResults(boolean flush) { - return mWifiNative.getScanResults(flush); + return mWifiNative.getBgScanResults(); } @Override diff --git a/service/java/com/android/server/wifi/scanner/WifiScannerImpl.java b/service/java/com/android/server/wifi/scanner/WifiScannerImpl.java index 98e87902a..5e1de30ef 100644 --- a/service/java/com/android/server/wifi/scanner/WifiScannerImpl.java +++ b/service/java/com/android/server/wifi/scanner/WifiScannerImpl.java @@ -48,7 +48,7 @@ public abstract class WifiScannerImpl { public WifiScannerImpl create(Context context, Looper looper, Clock clock) { WifiNative wifiNative = WifiInjector.getInstance().getWifiNative(); WifiMonitor wifiMonitor = WifiInjector.getInstance().getWifiMonitor(); - if (wifiNative.getScanCapabilities(new WifiNative.ScanCapabilities())) { + if (wifiNative.getBgScanCapabilities(new WifiNative.ScanCapabilities())) { return new HalWifiScannerImpl(context, wifiNative, wifiMonitor, looper, clock); } else { return new WificondScannerImpl(context, wifiNative, wifiMonitor, looper, |