summaryrefslogtreecommitdiffstats
path: root/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java
diff options
context:
space:
mode:
authorsongjinshi <songjinshi@xiaomi.com>2016-08-25 17:30:53 +0800
committer金时 宋 <songjinshi@xiaomi.com>2016-09-05 12:56:40 +0000
commit909a6e58d5cb6222f329ac8b3f2083db2345eed7 (patch)
treefbfbace71f2cc894ab9e4ddb4447f536b4a949f8 /service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java
parent4b887af1faf74bc5aa0660925b481822407bb2f7 (diff)
downloadandroid_frameworks_opt_net_wifi-909a6e58d5cb6222f329ac8b3f2083db2345eed7.tar.gz
android_frameworks_opt_net_wifi-909a6e58d5cb6222f329ac8b3f2083db2345eed7.tar.bz2
android_frameworks_opt_net_wifi-909a6e58d5cb6222f329ac8b3f2083db2345eed7.zip
[WifiScanningServiceImpl]:Fixes the system server crash issue.
When the ScanData results is null we should return to aviod the crash issue. https://code.google.com/p/android/issues/detail?id=219999 Change-Id: I4ccf4808208ec8dc7a96b798330cfc99551100cc Signed-off-by: songjinshi <songjinshi@xiaomi.com>
Diffstat (limited to 'service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java')
-rw-r--r--service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java b/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java
index df0c6e682..2d9ab04bc 100644
--- a/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java
+++ b/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java
@@ -1258,6 +1258,10 @@ public class WifiScanningServiceImpl extends IWifiScanner.Stub {
}
private void reportScanResults(ScanData[] results) {
+ if (results == null) {
+ Log.d(TAG,"The results is null, nothing to report.");
+ return;
+ }
for (ScanData result : results) {
if (result != null && result.getResults() != null) {
if (result.getResults().length > 0) {