From 80af71b92c8781f31cb84ed269109fb5c02e9942 Mon Sep 17 00:00:00 2001 From: lesl Date: Fri, 9 Apr 2021 05:48:37 +0800 Subject: [PATCH] wifi settings: Fix incorrect maximum compativibility toggle behavior Correct behavior: maximize_compatibility (enabled) 2.4 GHz Single AP maximize_compatibility (disabled) 5 GHz Preferred Single AP Bug: 184802466 Bug: 184802508 Test: Manual Test to check toggle behavior Test: RunSettingsRoboTests Test: atest -c WifiTetherMaximizeCompatibilityPreferenceControllerTest Change-Id: I0e97455ea9cf62294b50514ce912ef66d274db8d --- ...herMaximizeCompatibilityPreferenceController.java | 8 ++++---- ...aximizeCompatibilityPreferenceControllerTest.java | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/com/android/settings/wifi/tether/WifiTetherMaximizeCompatibilityPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherMaximizeCompatibilityPreferenceController.java index 67d1f49a5f9..a1a10ea643a 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherMaximizeCompatibilityPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherMaximizeCompatibilityPreferenceController.java @@ -99,10 +99,10 @@ public class WifiTetherMaximizeCompatibilityPreferenceController extends } // If the BridgedAp Concurrency is not supported in early Pixel devices (e.g. Pixel 2~5), - // show toggle on if the band includes SoftApConfiguration.BAND_5GHZ. + // show toggle on when band is 2.4G only. final int band = config.getBand(); Log.d(TAG, "getBand:" + band); - return (band & SoftApConfiguration.BAND_5GHZ) > 0; + return band == SoftApConfiguration.BAND_2GHZ; } /** @@ -128,8 +128,8 @@ public class WifiTetherMaximizeCompatibilityPreferenceController extends builder.setBridgedModeOpportunisticShutdownEnabled(!enabled); } else { int band = enabled - ? SoftApConfiguration.BAND_2GHZ | SoftApConfiguration.BAND_5GHZ - : SoftApConfiguration.BAND_2GHZ; + ? SoftApConfiguration.BAND_2GHZ + : SoftApConfiguration.BAND_2GHZ | SoftApConfiguration.BAND_5GHZ; Log.d(TAG, "setBand:" + band); builder.setBand(band); } diff --git a/tests/unit/src/com/android/settings/wifi/tether/WifiTetherMaximizeCompatibilityPreferenceControllerTest.java b/tests/unit/src/com/android/settings/wifi/tether/WifiTetherMaximizeCompatibilityPreferenceControllerTest.java index 0ee9e70fe71..3d8b24c5f2f 100644 --- a/tests/unit/src/com/android/settings/wifi/tether/WifiTetherMaximizeCompatibilityPreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/wifi/tether/WifiTetherMaximizeCompatibilityPreferenceControllerTest.java @@ -168,7 +168,7 @@ public class WifiTetherMaximizeCompatibilityPreferenceControllerTest { .build(); doReturn(config).when(mWifiManager).getSoftApConfiguration(); - assertThat(mController.isMaximizeCompatibilityEnabled()).isEqualTo(false); + assertThat(mController.isMaximizeCompatibilityEnabled()).isEqualTo(true); } @Test @@ -179,7 +179,7 @@ public class WifiTetherMaximizeCompatibilityPreferenceControllerTest { .build(); doReturn(config).when(mWifiManager).getSoftApConfiguration(); - assertThat(mController.isMaximizeCompatibilityEnabled()).isEqualTo(true); + assertThat(mController.isMaximizeCompatibilityEnabled()).isEqualTo(false); } @Test @@ -190,7 +190,7 @@ public class WifiTetherMaximizeCompatibilityPreferenceControllerTest { .build(); doReturn(config).when(mWifiManager).getSoftApConfiguration(); - assertThat(mController.isMaximizeCompatibilityEnabled()).isEqualTo(true); + assertThat(mController.isMaximizeCompatibilityEnabled()).isEqualTo(false); } @Test @@ -223,7 +223,8 @@ public class WifiTetherMaximizeCompatibilityPreferenceControllerTest { SoftApConfiguration.Builder builder = new SoftApConfiguration.Builder(); mController.setupMaximizeCompatibility(builder); - assertThat(builder.build().getBand()).isEqualTo(SoftApConfiguration.BAND_2GHZ); + assertThat(builder.build().getBand()) + .isEqualTo(SoftApConfiguration.BAND_2GHZ | SoftApConfiguration.BAND_5GHZ); } @Test @@ -234,7 +235,6 @@ public class WifiTetherMaximizeCompatibilityPreferenceControllerTest { SoftApConfiguration.Builder builder = new SoftApConfiguration.Builder(); mController.setupMaximizeCompatibility(builder); - assertThat(builder.build().getBand()) - .isEqualTo(SoftApConfiguration.BAND_2GHZ | SoftApConfiguration.BAND_5GHZ); + assertThat(builder.build().getBand()).isEqualTo(SoftApConfiguration.BAND_2GHZ); } }