diff options
| author | Vinit Deshpande <vinitd@google.com> | 2016-01-12 18:38:05 -0800 |
|---|---|---|
| committer | Vinit Deshpande <vinitd@google.com> | 2016-01-12 18:38:05 -0800 |
| commit | 549225687bc441fff055c58c777498f83b8cc29f (patch) | |
| tree | 32dda2f8c3f88520717158a9b2031841833ff5b7 | |
| parent | fdce524fd05844c996cf1c5c0c102a87fde8e32c (diff) | |
| download | android_frameworks_opt_net_wifi-549225687bc441fff055c58c777498f83b8cc29f.tar.gz android_frameworks_opt_net_wifi-549225687bc441fff055c58c777498f83b8cc29f.tar.bz2 android_frameworks_opt_net_wifi-549225687bc441fff055c58c777498f83b8cc29f.zip | |
Guard against HAL returning null scan results
Bug: 26374148
Change-Id: I3355f969f237fd4ba50e980f83bcbcacc7e55c84
| -rw-r--r-- | service/java/com/android/server/wifi/WifiNative.java | 9 |
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]; } } } |