PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "wifi settings: Fix incorrect maximum compativibility toggle behavior" into sc-dev am: a586dc3a96

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14124309

Change-Id: I427fcf75c1a0d820e5f6a59871338a2d5f418ed0
This commit is contained in:
TreeHugger Robot
2021-04-09 05:12:23 +00:00
committed by Automerger Merge Worker
parent 17fd36fad8 a586dc3a96
commit 839077f5e1
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/wifi/tether/WifiTetherMaximizeCompatibilityPreferenceController.java
View File

@@ -99,10 +99,10 @@ public class WifiTetherMaximizeCompatibilityPreferenceController extends
} }
// If the BridgedAp Concurrency is not supported in early Pixel devices (e.g. Pixel 2~5), // 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(); final int band = config.getBand();
Log.d(TAG, "getBand:" + band); 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); builder.setBridgedModeOpportunisticShutdownEnabled(!enabled);
} else { } else {
int band = enabled 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); Log.d(TAG, "setBand:" + band);
builder.setBand(band); builder.setBand(band);
} }

12
tests/unit/src/com/android/settings/wifi/tether/WifiTetherMaximizeCompatibilityPreferenceControllerTest.java
View File

@@ -168,7 +168,7 @@ public class WifiTetherMaximizeCompatibilityPreferenceControllerTest {
.build(); .build();
doReturn(config).when(mWifiManager).getSoftApConfiguration(); doReturn(config).when(mWifiManager).getSoftApConfiguration();
assertThat(mController.isMaximizeCompatibilityEnabled()).isEqualTo(false); assertThat(mController.isMaximizeCompatibilityEnabled()).isEqualTo(true);
} }
@Test @Test
@@ -179,7 +179,7 @@ public class WifiTetherMaximizeCompatibilityPreferenceControllerTest {
.build(); .build();
doReturn(config).when(mWifiManager).getSoftApConfiguration(); doReturn(config).when(mWifiManager).getSoftApConfiguration();
assertThat(mController.isMaximizeCompatibilityEnabled()).isEqualTo(true); assertThat(mController.isMaximizeCompatibilityEnabled()).isEqualTo(false);
} }
@Test @Test
@@ -190,7 +190,7 @@ public class WifiTetherMaximizeCompatibilityPreferenceControllerTest {
.build(); .build();
doReturn(config).when(mWifiManager).getSoftApConfiguration(); doReturn(config).when(mWifiManager).getSoftApConfiguration();
assertThat(mController.isMaximizeCompatibilityEnabled()).isEqualTo(true); assertThat(mController.isMaximizeCompatibilityEnabled()).isEqualTo(false);
} }
@Test @Test
@@ -223,7 +223,8 @@ public class WifiTetherMaximizeCompatibilityPreferenceControllerTest {
SoftApConfiguration.Builder builder = new SoftApConfiguration.Builder(); SoftApConfiguration.Builder builder = new SoftApConfiguration.Builder();
mController.setupMaximizeCompatibility(builder); mController.setupMaximizeCompatibility(builder);
assertThat(builder.build().getBand()).isEqualTo(SoftApConfiguration.BAND_2GHZ); assertThat(builder.build().getBand())
.isEqualTo(SoftApConfiguration.BAND_2GHZ | SoftApConfiguration.BAND_5GHZ);
} }
@Test @Test
@@ -234,7 +235,6 @@ public class WifiTetherMaximizeCompatibilityPreferenceControllerTest {
SoftApConfiguration.Builder builder = new SoftApConfiguration.Builder(); SoftApConfiguration.Builder builder = new SoftApConfiguration.Builder();
mController.setupMaximizeCompatibility(builder); mController.setupMaximizeCompatibility(builder);
assertThat(builder.build().getBand()) assertThat(builder.build().getBand()).isEqualTo(SoftApConfiguration.BAND_2GHZ);
.isEqualTo(SoftApConfiguration.BAND_2GHZ | SoftApConfiguration.BAND_5GHZ);
} }
} }