1 files changed, 7 insertions, 9 deletions
diff --git a/com/android/server/wifi/scanner/WificondScannerImpl.java b/com/android/server/wifi/scanner/WificondScannerImpl.java
index 10fc8e3e..fb878e67 100644
--- a/com/android/server/wifi/scanner/WificondScannerImpl.java
+++ b/com/android/server/wifi/scanner/WificondScannerImpl.java
@@ -167,12 +167,12 @@ public class WificondScannerImpl extends WifiScannerImpl implements Handler.Call
                     + ",eventHandler=" + eventHandler);
             return false;
         }
+        if (mPendingSingleScanSettings != null
+                || (mLastScanSettings != null && mLastScanSettings.singleScanActive)) {
+            Log.w(TAG, "A single scan is already running");
+            return false;
+        }
         synchronized (mSettingsLock) {
-            if (mPendingSingleScanSettings != null
-                    || (mLastScanSettings != null && mLastScanSettings.singleScanActive)) {
-                Log.w(TAG, "A single scan is already running");
-                return false;
-            }
             mPendingSingleScanSettings = settings;
             mPendingSingleScanEventHandler = eventHandler;
             processPendingScans();
@@ -518,10 +518,8 @@ public class WificondScannerImpl extends WifiScannerImpl implements Handler.Call
     }
 
     private boolean isHwPnoScanRequired() {
-        synchronized (mSettingsLock) {
-            if (mPnoSettings == null) return false;
-            return isHwPnoScanRequired(mPnoSettings.isConnected);
-        }
+        if (mPnoSettings == null) return false;
+        return isHwPnoScanRequired(mPnoSettings.isConnected);
     }
 
     @Override