From bd3e31c5018ceabd260c7fdd072d067caaa06cd5 Mon Sep 17 00:00:00 2001 From: Roshan Pius Date: Fri, 11 Sep 2020 11:48:41 -0700 Subject: WifiScanner: Partial revert of ag/12269583 Temporary fix that might break 60Ghz, will let jimmy debug that later. Bug: 168277359 Test: Manually verified that we can see scan results on settings even when the country code does not support DFS channels. Test: atest android.net.wifi Change-Id: I292324e8cfc0d90e7450b1dcb37cab55cd09328f --- wifi/java/android/net/wifi/WifiScanner.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/wifi/java/android/net/wifi/WifiScanner.java b/wifi/java/android/net/wifi/WifiScanner.java index a68d7e260b6a..41d0857214f3 100644 --- a/wifi/java/android/net/wifi/WifiScanner.java +++ b/wifi/java/android/net/wifi/WifiScanner.java @@ -193,8 +193,6 @@ public class WifiScanner { * @hide */ public static boolean isFullBandScan(@WifiBand int bandScanned, boolean excludeDfs) { - // 5GHz DFS channel is part of 5GHz, mark 5GHz scanned as well. - if ((bandScanned & WIFI_BAND_5_GHZ_DFS_ONLY) != 0) bandScanned |= WIFI_BAND_5_GHZ; return (bandScanned | WIFI_BAND_6_GHZ | WIFI_BAND_60_GHZ | (excludeDfs ? WIFI_BAND_5_GHZ_DFS_ONLY : 0)) == WIFI_BAND_ALL; -- cgit v1.2.3-59-g8ed1b