Fix crash when cleaning up WifiScanner client before Wifi enabled am: 3040b86393 am: 82f4aada1c

am: cecab03d5d

Change-Id: I1378659fc87d0b419a8f96e4fec779e4251db158

1 files changed, 9 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 95bdce831..b29718db9 100644
--- a/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java
+++ b/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java
@@ -1095,6 +1095,10 @@ public class WifiScanningServiceImpl extends IWifiScanner.Stub {
         }
 
         private boolean updateSchedule() {
+            if (mChannelHelper == null || mBackgroundScheduler == null || mScannerImpl == null) {
+                loge("Failed to update schedule because WifiScanningService is not initialized");
+                return false;
+            }
             mChannelHelper.updateChannels();
             Collection<ScanSettings> settings = mActiveBackgroundScans.getAllSettings();
 
@@ -1221,6 +1225,11 @@ public class WifiScanningServiceImpl extends IWifiScanner.Stub {
         }
 
         private void resetHotlist() {
+            if (mScannerImpl == null) {
+                loge("Failed to update hotlist because WifiScanningService is not initialized");
+                return;
+            }
+
             Collection<WifiScanner.HotlistSettings> settings =
                     mActiveHotlistSettings.getAllSettings();
             int num_hotlist_ap = 0;