WifiScanningService: Remove |pnoSettings| in stopPno

Remove the |pnoSettings| param for stopPno requests. We added this param
to revert network priorities in supplicant after PNO. But, because we
have disabled all auto-connect in wpa_supplicant having the wrong
priorities is irrelevant now.

Note: Will add a follow up CL to remove it from the WifiScanner
interface.

BUG: 27532350
Change-Id: I8bc4102b7e45699152a2ee0f816d65738b8531fa
TEST: Compiles & unit test passes

4 files changed, 5 insertions, 6 deletions

diff --git a/service/java/com/android/server/wifi/HalWifiScannerImpl.java b/service/java/com/android/server/wifi/HalWifiScannerImpl.java
index d80e9660e..24942ad3c 100644
--- a/service/java/com/android/server/wifi/HalWifiScannerImpl.java
+++ b/service/java/com/android/server/wifi/HalWifiScannerImpl.java
@@ -129,11 +129,11 @@ public class HalWifiScannerImpl extends WifiScannerImpl implements Handler.Callb
     }
 
     @Override
-    public boolean resetHwPnoList(WifiNative.PnoSettings settings) {
+    public boolean resetHwPnoList() {
         if (mHalBasedPnoSupported) {
             return mWifiNative.resetPnoList();
         } else {
-            return mSupplicantScannerDelegate.resetHwPnoList(settings);
+            return mSupplicantScannerDelegate.resetHwPnoList();
         }
     }
 
diff --git a/service/java/com/android/server/wifi/SupplicantWifiScannerImpl.java b/service/java/com/android/server/wifi/SupplicantWifiScannerImpl.java
index 1b4812273..2d42e076f 100644
--- a/service/java/com/android/server/wifi/SupplicantWifiScannerImpl.java
+++ b/service/java/com/android/server/wifi/SupplicantWifiScannerImpl.java
@@ -714,7 +714,7 @@ public class SupplicantWifiScannerImpl extends WifiScannerImpl implements Handle
     }
 
     @Override
-    public boolean resetHwPnoList(WifiNative.PnoSettings settings) {
+    public boolean resetHwPnoList() {
         synchronized (mSettingsLock) {
             if (mPnoSettings == null) {
                 Log.w(TAG, "No PNO scan running");
diff --git a/service/java/com/android/server/wifi/WifiScannerImpl.java b/service/java/com/android/server/wifi/WifiScannerImpl.java
index e89e3c5ca..5ade2a73e 100644
--- a/service/java/com/android/server/wifi/WifiScannerImpl.java
+++ b/service/java/com/android/server/wifi/WifiScannerImpl.java
@@ -137,10 +137,9 @@ public abstract class WifiScannerImpl {
 
     /**
      * Reset PNO list to terminate PNO background scan.
-     * @param settings PNO settings for this scan.
      * @return true if success, false otherwise
      */
-    public abstract boolean resetHwPnoList(WifiNative.PnoSettings settings);
+    public abstract boolean resetHwPnoList();
 
     /**
      * This returns whether HW PNO is supported or not.
diff --git a/service/java/com/android/server/wifi/WifiScanningServiceImpl.java b/service/java/com/android/server/wifi/WifiScanningServiceImpl.java
index 0586c70f1..afca8ad0d 100644
--- a/service/java/com/android/server/wifi/WifiScanningServiceImpl.java
+++ b/service/java/com/android/server/wifi/WifiScanningServiceImpl.java
@@ -1221,7 +1221,7 @@ public class WifiScanningServiceImpl extends IWifiScanner.Stub {
 
                 boolean wasBackgroundScanScheduled;
                 if (mScannerImpl.isHwPnoSupported(pnoSettings.isConnected)) {
-                    mScannerImpl.resetHwPnoList(convertPnoSettingsToNative(pnoSettings));
+                    mScannerImpl.resetHwPnoList();
                     wasBackgroundScanScheduled =
                             mScannerImpl.shouldScheduleBackgroundScanForHwPno();
                 } else {