Merge "WifiConnectivityManager: Disable PNO scans"

1 files changed, 3 insertions, 5 deletions

diff --git a/service/java/com/android/server/wifi/WifiConnectivityManager.java b/service/java/com/android/server/wifi/WifiConnectivityManager.java
index 357fa32ed..5210adcaa 100644
--- a/service/java/com/android/server/wifi/WifiConnectivityManager.java
+++ b/service/java/com/android/server/wifi/WifiConnectivityManager.java
@@ -900,12 +900,10 @@ public class WifiConnectivityManager {
             return;
         }
 
-        if (mScreenOn) {
+        // TODO(b/32977707): Start PNO scans when screen is off once wificond's interface
+        // is hooked on to WifiScanningService.
+        if (mScreenOn || (mWifiState == WIFI_STATE_DISCONNECTED)) {
             startPeriodicScan(scanImmediately);
-        } else { // screenOff
-            if (mWifiState == WIFI_STATE_DISCONNECTED) {
-                startDisconnectedPnoScan();
-            }
         }
     }