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

Merge "Avoid disabling the Wi-Fi hotspot switch causing Talkback confusion" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-10-28 05:38:51 +00:00
committed by Android (Google) Code Review
parent 37ae076618 259d3a47c8
commit 75e2dc4b21
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/wifi/tether/WifiTetherSwitchBarController.java
View File

@@ -57,6 +57,9 @@ public class WifiTetherSwitchBarController implements
private final ConnectivityManager mConnectivityManager; private final ConnectivityManager mConnectivityManager;
private final WifiManager mWifiManager; private final WifiManager mWifiManager;
@VisibleForTesting
boolean mIsSwitchBusy;
@VisibleForTesting @VisibleForTesting
DataSaverBackend mDataSaverBackend; DataSaverBackend mDataSaverBackend;
@VisibleForTesting @VisibleForTesting
@@ -102,8 +105,8 @@ public class WifiTetherSwitchBarController implements
@Override @Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
// Filter out unnecessary callbacks when switch is disabled. // Filter out inappropriate callbacks when switch is busy.
if (!buttonView.isEnabled()) return; if (mIsSwitchBusy) return;
if (isChecked) { if (isChecked) {
startTether(); startTether();
@@ -115,14 +118,14 @@ public class WifiTetherSwitchBarController implements
void stopTether() { void stopTether() {
if (!isWifiApActivated()) return; if (!isWifiApActivated()) return;
mSwitchBar.setEnabled(false); mIsSwitchBusy = true;
mConnectivityManager.stopTethering(TETHERING_WIFI); mConnectivityManager.stopTethering(TETHERING_WIFI);
} }
void startTether() { void startTether() {
if (isWifiApActivated()) return; if (isWifiApActivated()) return;
mSwitchBar.setEnabled(false); mIsSwitchBusy = true;
mConnectivityManager.startTethering(TETHERING_WIFI, true /* showProvisioningUi */, mConnectivityManager.startTethering(TETHERING_WIFI, true /* showProvisioningUi */,
mOnStartTetheringCallback, new Handler(Looper.getMainLooper())); mOnStartTetheringCallback, new Handler(Looper.getMainLooper()));
} }
@@ -159,6 +162,7 @@ public class WifiTetherSwitchBarController implements
private void updateWifiSwitch() { private void updateWifiSwitch() {
mSwitchBar.setEnabled(!mDataSaverBackend.isDataSaverEnabled()); mSwitchBar.setEnabled(!mDataSaverBackend.isDataSaverEnabled());
mIsSwitchBusy = false;
} }
@Override @Override

4
tests/robotests/src/com/android/settings/wifi/tether/WifiTetherSwitchBarControllerTest.java
View File

@@ -147,8 +147,8 @@ public class WifiTetherSwitchBarControllerTest {
} }
@Test @Test
public void onSwitchChanged_switchNotEnabled_doNothingForTethering() { public void onSwitchChanged_switchIsBusy_doNothingForTethering() {
when(mSwitch.isEnabled()).thenReturn(false); mController.mIsSwitchBusy = true;
mController.onCheckedChanged(mSwitch, true); mController.onCheckedChanged(mSwitch, true);