wlan: Honour regular scan in case Preferred Network Offload scan fails

In suspend mode STA fails to connect to an AP if preferred network
offload configuration is failed to configure the saved profile.

Framework sets a scan alarm if the PNO configuration fails. This
scan alarm apparently fails to issue a scan for mCurrentScanAlarmMs
set to 0 . Thus, set this parameter to mDisconnectedScanPeriodMs for
the cases when PNO trigger fails.

Change-Id: Iaa793642fe3c9dd307b199438368baa26a33bd61
CRs-Fixed: 753999

1 files changed, 4 insertions, 0 deletions

diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java
index 47cc21922..89ab00b90 100644
--- a/service/java/com/android/server/wifi/WifiStateMachine.java
+++ b/service/java/com/android/server/wifi/WifiStateMachine.java
@@ -3006,6 +3006,7 @@ public class WifiStateMachine extends StateMachine {
         if (startBackgroundScanIfNeeded) {
             if (mEnableBackgroundScan) {
                 if (!mWifiNative.enableBackgroundScan(true)) {
+                    mCurrentScanAlarmMs = mDisconnectedScanPeriodMs;
                     setScanAlarm(true, 200);
                 } else {
                     setScanAlarm(false, 0);
@@ -7667,6 +7668,7 @@ public class WifiStateMachine extends StateMachine {
                  */
                 if (!mIsScanOngoing) {
                     if (!mWifiNative.enableBackgroundScan(true)) {
+                        mCurrentScanAlarmMs = mDisconnectedScanPeriodMs;
                         setScanAlarm(true, 200);
                     } else {
                         setScanAlarm(false, 0);
@@ -7757,6 +7759,7 @@ public class WifiStateMachine extends StateMachine {
                     /* Re-enable background scan when a pending scan result is received */
                     if (mEnableBackgroundScan && mIsScanOngoing) {
                         if (!mWifiNative.enableBackgroundScan(true)) {
+                            mCurrentScanAlarmMs = mDisconnectedScanPeriodMs;
                             setScanAlarm(true, 200);
                         } else {
                             setScanAlarm(false, 0);
@@ -7782,6 +7785,7 @@ public class WifiStateMachine extends StateMachine {
                     } else if (mEnableBackgroundScan && !mP2pConnected.get() &&
                                (mWifiConfigStore.getConfiguredNetworks().size() != 0)) {
                         if (!mWifiNative.enableBackgroundScan(true)) {
+                            mCurrentScanAlarmMs = mDisconnectedScanPeriodMs;
                             setScanAlarm(true, 200);
                         } else {
                             setScanAlarm(false, 0);