Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd3e31c5 authored by Roshan Pius's avatar Roshan Pius
Browse files

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
parent 854bcaa6

wifi/java/android/net/wifi/WifiScanner.java

+0 −2
Original line number Original line Diff line number Diff line
@@ -193,8 +193,6 @@ public class WifiScanner { 
     * @hide

     * @hide

     */

     */

    public static boolean isFullBandScan(@WifiBand int bandScanned, boolean excludeDfs) {

    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

        return (bandScanned | WIFI_BAND_6_GHZ | WIFI_BAND_60_GHZ

                | (excludeDfs ? WIFI_BAND_5_GHZ_DFS_ONLY : 0))

                | (excludeDfs ? WIFI_BAND_5_GHZ_DFS_ONLY : 0))

                == WIFI_BAND_ALL;

                == WIFI_BAND_ALL;