1 files changed, 6 insertions, 2 deletions
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java
index fabc85b98..15477138d 100755
--- a/service/java/com/android/server/wifi/WifiStateMachine.java
+++ b/service/java/com/android/server/wifi/WifiStateMachine.java
@@ -67,6 +67,7 @@ import android.net.wifi.SupplicantState;
 import android.net.wifi.WifiChannel;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiConnectionStatistics;
+import android.net.wifi.WifiEapSimInfo;
 import android.net.wifi.WifiEnterpriseConfig;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiLinkLayerStats;
@@ -1722,6 +1723,7 @@ public class WifiStateMachine extends StateMachine {
             return false;
         }
         if (mP2pConnected.get()) {
+            int scanSource = msg.arg1;
             if (scanSource == SCAN_ALARM_SOURCE) {
                 if (VDBG) {
                     logd("P2P connected: lastScanDuringP2p=" +
@@ -2273,7 +2275,7 @@ public class WifiStateMachine extends StateMachine {
      * Get sim info  synchronously
      */
 
-    public WifiEapSimInfo  syncGetSimInfo(AsyncChannel channel) {
+    public WifiEapSimInfo syncGetSimInfo(AsyncChannel channel) {
         Message resultMsg = channel.sendMessageSynchronously(CMD_GET_SIM_INFO);
         WifiEapSimInfo  mWifiEapSimInfo = (WifiEapSimInfo) resultMsg.obj;
         resultMsg.recycle();
@@ -8092,7 +8094,9 @@ public class WifiStateMachine extends StateMachine {
                      * cleared
                      */
                     if (!mIsScanOngoing) {
-                        enableBackgroundScan(true);
+                        if (!mWifiNative.enableBackgroundScan(true)) {
+                            handlePnoFailError();
+                        }
                     }
                 } else {
                     setScanAlarm(true);