diff options
| author | Nalla Kartheek <karthe@codeaurora.org> | 2015-12-23 19:32:01 +0530 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-06-24 11:28:49 -1000 |
| commit | c06efae309a47fe7cd22d0b1dcb616112e1b5be0 (patch) | |
| tree | 009bb7741ada79b380dac9e2edd4a8cb1002c4eb /service | |
| parent | faada83cd0cdc39fc805bc0ff5d67ac070802a0a (diff) | |
| download | android_frameworks_opt_net_wifi-c06efae309a47fe7cd22d0b1dcb616112e1b5be0.tar.gz android_frameworks_opt_net_wifi-c06efae309a47fe7cd22d0b1dcb616112e1b5be0.tar.bz2 android_frameworks_opt_net_wifi-c06efae309a47fe7cd22d0b1dcb616112e1b5be0.zip | |
Wifi: Add NULL check before processing gscan results
WifiScanningService shall query the gscan results through WiFiNative's
getScanResults API, which shall return NULL, if isHalStarted fails.
Since, WiFiService and WiFiScanningService run in different contexts,
a query for the gscan results shall happen while the WiFi is
disabled(setWifiEnabled == FALSE). This would result in a NULL being
returned by getScanResults API. Hence the check.
Change-Id: Icf9e37aca568e23a26a5301434adcde6af7512ab
CRs-Fixed: 936628
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiScanningServiceImpl.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/WifiScanningServiceImpl.java b/service/java/com/android/server/wifi/WifiScanningServiceImpl.java index 9038b4eec..a2ff1d8d8 100644 --- a/service/java/com/android/server/wifi/WifiScanningServiceImpl.java +++ b/service/java/com/android/server/wifi/WifiScanningServiceImpl.java @@ -445,6 +445,10 @@ public class WifiScanningServiceImpl extends IWifiScanner.Stub { break; case CMD_SCAN_RESULTS_AVAILABLE: { ScanData[] results = WifiNative.getScanResults(/* flush = */ true); + if (results == null) { + loge("Wifi HAL SCAN results NULL"); + break; + } Collection<ClientInfo> clients = mClients.values(); for (ClientInfo ci2 : clients) { ci2.reportScanResults(results); |