diff options
author | Ningyuan Wang <nywang@google.com> | 2017-03-07 21:08:44 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-03-07 21:08:44 +0000 |
commit | 622fa1247e4fdbc588e9ff15ea36e5f1adb50a62 (patch) | |
tree | 5654177bb01cd75253a125cf79955887a27511fd /service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java | |
parent | 6aa1a4faa42609f8613cdf31d407d262115f684d (diff) | |
parent | d5911700133cc1069c5b67b8af77f4a1fdec25d7 (diff) | |
download | android_frameworks_opt_net_wifi-622fa1247e4fdbc588e9ff15ea36e5f1adb50a62.tar.gz android_frameworks_opt_net_wifi-622fa1247e4fdbc588e9ff15ea36e5f1adb50a62.tar.bz2 android_frameworks_opt_net_wifi-622fa1247e4fdbc588e9ff15ea36e5f1adb50a62.zip |
Request Pno scan via wificond and re-enable pno scan am: 04c453c2e0 am: aa4cd04469
am: d591170013
Change-Id: Ie9b5bac0c47e7dc2faee7efec73e3597aa1e7c3e
Diffstat (limited to 'service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java')
-rw-r--r-- | service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java b/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java index f8fd9185c..726c3e86e 100644 --- a/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java +++ b/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java @@ -1769,8 +1769,10 @@ public class WifiScanningServiceImpl extends IWifiScanner.Stub { } } - private WifiNative.PnoSettings convertPnoSettingsToNative(PnoSettings pnoSettings) { + private WifiNative.PnoSettings convertSettingsToPnoNative(ScanSettings scanSettings, + PnoSettings pnoSettings) { WifiNative.PnoSettings nativePnoSetting = new WifiNative.PnoSettings(); + nativePnoSetting.periodInMs = scanSettings.periodInMs; nativePnoSetting.min5GHzRssi = pnoSettings.min5GHzRssi; nativePnoSetting.min24GHzRssi = pnoSettings.min24GHzRssi; nativePnoSetting.initialScoreMax = pnoSettings.initialScoreMax; @@ -1840,7 +1842,8 @@ public class WifiScanningServiceImpl extends IWifiScanner.Stub { loge("Failing scan request because there is already an active scan"); return false; } - WifiNative.PnoSettings nativePnoSettings = convertPnoSettingsToNative(pnoSettings); + WifiNative.PnoSettings nativePnoSettings = + convertSettingsToPnoNative(scanSettings, pnoSettings); if (!mScannerImpl.setHwPnoList(nativePnoSettings, mPnoScanStateMachine)) { return false; } |