Request Pno scan via wificond and re-enable pno scan

Bug: 32977707
Test: compile, unit tests, manual test, will do integration test

Change-Id: I3b7d5020aa695120a047a2d228fc6be5760e2343

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 b34410aa0..7da5857f7 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;
             }