diff options
| author | 2020-09-12 02:25:39 +0000 | |
|---|---|---|
| committer | 2020-09-12 02:25:39 +0000 | |
| commit | 08fa36a798b4e8814e79f35d80da63a9d31004da (patch) | |
| tree | 2e73951c8ed8da07ca8d526bd3db93627531fa3e | |
| parent | b7d6998e66bd536b21340323883d272b50443c91 (diff) | |
| parent | bd3e31c5018ceabd260c7fdd072d067caaa06cd5 (diff) | |
Merge "WifiScanner: Partial revert of ag/12269583"
| -rw-r--r-- | wifi/java/android/net/wifi/WifiScanner.java | 2 |
1 files changed, 0 insertions, 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; |