Merge "WifiScanningService: Handle getAvailableChannels() when scanner is off" into rvc-dev

1 files changed, 1 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 a46d4878a..1e67dd584 100644
--- a/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java
+++ b/service/java/com/android/server/wifi/scanner/WifiScanningServiceImpl.java
@@ -128,6 +128,7 @@ public class WifiScanningServiceImpl extends IWifiScanner.Stub {
         }
 
         ChannelSpec[][] channelSpecs = mWifiThreadRunner.call(() -> {
+            if (mChannelHelper == null) return new ChannelSpec[0][0];
             mChannelHelper.updateChannels();
             return mChannelHelper.getAvailableScanChannels(band);
         }, new ChannelSpec[0][0]);