Fix crashes in significant change when wifi hasn\\'t started am: 11bb0926a6

am: f1f88eebd8

Change-Id: I9baa8a9a3bb9612df15289efbc5921dcd3a555a0

1 files changed, 7 insertions, 3 deletions

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) {