diff options
| author | Mitchell Wills <mwills@google.com> | 2016-07-01 10:28:53 -0700 |
|---|---|---|
| committer | Mitchell Wills <mwills@google.com> | 2016-07-01 11:31:01 -0700 |
| commit | ed70365e5a3a6e2b06c2d4d06603f97596f1124b (patch) | |
| tree | 3626c09901879b6e1b1294502816fdfae2782def /service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java | |
| parent | 450fee26a21eb56d536df147d3e88d3549f807c0 (diff) | |
| download | android_frameworks_opt_net_wifi-ed70365e5a3a6e2b06c2d4d06603f97596f1124b.tar.gz android_frameworks_opt_net_wifi-ed70365e5a3a6e2b06c2d4d06603f97596f1124b.tar.bz2 android_frameworks_opt_net_wifi-ed70365e5a3a6e2b06c2d4d06603f97596f1124b.zip | |
Fix NPE in WifiScanningService
Fixes: 29924121
Change-Id: Iabb8111d0d4cdef6b02710f6ea2b3545f1b6d70b
Diffstat (limited to 'service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java')
| -rw-r--r-- | service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java | 3 |
1 files changed, 3 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 b98b4d121..7024e3b86 100644 --- a/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java +++ b/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java @@ -701,6 +701,9 @@ public class WifiScanningServiceImpl extends IWifiScanner.Stub { } if (settings.hiddenNetworkIds != null) { + if (mActiveScanSettings.hiddenNetworkIds == null) { + return false; + } Set<Integer> activeHiddenNetworkIds = new HashSet<>(); for (int id : mActiveScanSettings.hiddenNetworkIds) { activeHiddenNetworkIds.add(id); |