1 files changed, 7 insertions, 2 deletions
diff --git a/service/java/com/android/server/wifi/WifiNative.java b/service/java/com/android/server/wifi/WifiNative.java
index 6a79587bf..7bdd17c3e 100644
--- a/service/java/com/android/server/wifi/WifiNative.java
+++ b/service/java/com/android/server/wifi/WifiNative.java
@@ -1764,10 +1764,15 @@ public class WifiNative {
 
     synchronized public static WifiScanner.ScanData[] getScanResults(boolean flush) {
         synchronized (mLock) {
+            WifiScanner.ScanData[] sd = null;
             if (isHalStarted()) {
-                return getScanResultsNative(sWlan0Index, flush);
+                sd = getScanResultsNative(sWlan0Index, flush);
+            }
+
+            if (sd != null) {
+                return sd;
             } else {
-                return null;
+                return new WifiScanner.ScanData[0];
             }
         }
     }