From 11bb0926a6cc3380f2217532fefb9605a1fdc9e8 Mon Sep 17 00:00:00 2001 From: Mitchell Wills Date: Thu, 9 Jun 2016 09:39:25 -0700 Subject: Fix crashes in significant change when wifi hasn't started The SignificantChange state machine doesn't actually have a concept of if Wifi is on or not. This will simply ensure that it is not possible to cause a crash. Change-Id: I8ff87364bf7d5c87f0519b6cdc32d164facf30eb Fixes: 29237535 --- .../android/server/wifi/scanner/WifiScanningServiceImpl.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'service/java') diff --git a/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java b/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java index a82ce1f25..5c085432a 100644 --- a/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java +++ b/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java @@ -2373,12 +2373,16 @@ public class WifiScanningServiceImpl extends IWifiScanner.Stub { } private void trackSignificantWifiChange(WifiScanner.WifiChangeSettings settings) { - mScannerImpl.untrackSignificantWifiChange(); - mScannerImpl.trackSignificantWifiChange(settings, this); + if (mScannerImpl != null) { + mScannerImpl.untrackSignificantWifiChange(); + mScannerImpl.trackSignificantWifiChange(settings, this); + } } private void untrackSignificantWifiChange() { - mScannerImpl.untrackSignificantWifiChange(); + if (mScannerImpl != null) { + mScannerImpl.untrackSignificantWifiChange(); + } } private void addWifiChangeHandler(ClientInfo ci, int handler) { -- cgit v1.2.3