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

Merge "Only start tether when not already enabled" into pi-dev

Browse Source 
am: f62f91b0b6

Change-Id: If28a47b85fab06484298196305e862759998a72f
This commit is contained in:
Salvador Martinez
2018-04-26 14:15:25 -07:00
committed by android-build-merger
parent 2332aad2a6 f62f91b0b6
commit 964d107491
2 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -91,10 +91,10 @@ public class WifiTetherSwitchBarController implements SwitchWidgetController.OnS
@Override @Override
public boolean onSwitchToggled(boolean isChecked) { public boolean onSwitchToggled(boolean isChecked) {
if (isChecked) { if (!isChecked) {
startTether();
} else {
stopTether(); stopTether();
} else if (!mWifiManager.isWifiApEnabled()) {
startTether();
} }
return true; return true;
} }

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

@@ -18,7 +18,15 @@ package com.android.settings.wifi.tether;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import android.content.Context; import android.content.Context;
@@ -68,7 +76,7 @@ public class WifiTetherSwitchBarControllerTest {
} }
@Test @Test
public void testConstructor_airplaneModeOn_switchBarDisabled() { public void constructor_airplaneModeOn_switchBarDisabled() {
Settings.Global.putInt(RuntimeEnvironment.application.getContentResolver(), Settings.Global.putInt(RuntimeEnvironment.application.getContentResolver(),
Settings.Global.AIRPLANE_MODE_ON, 1); Settings.Global.AIRPLANE_MODE_ON, 1);
@@ -79,7 +87,7 @@ public class WifiTetherSwitchBarControllerTest {
} }
@Test @Test
public void testStartTether_fail_resetSwitchBar() { public void startTether_fail_resetSwitchBar() {
when(mNetworkPolicyManager.getRestrictBackground()).thenReturn(false); when(mNetworkPolicyManager.getRestrictBackground()).thenReturn(false);
mController.startTether(); mController.startTether();
@@ -90,7 +98,7 @@ public class WifiTetherSwitchBarControllerTest {
} }
@Test @Test
public void testOnDataSaverChanged_setsEnabledCorrectly() { public void onDataSaverChanged_setsEnabledCorrectly() {
assertThat(mSwitchBar.isEnabled()).isTrue(); assertThat(mSwitchBar.isEnabled()).isTrue();
// try to turn data saver on // try to turn data saver on
@@ -102,6 +110,19 @@ public class WifiTetherSwitchBarControllerTest {
when(mNetworkPolicyManager.getRestrictBackground()).thenReturn(false); when(mNetworkPolicyManager.getRestrictBackground()).thenReturn(false);
mController.onDataSaverChanged(false); mController.onDataSaverChanged(false);
assertThat(mSwitchBar.isEnabled()).isTrue(); assertThat(mSwitchBar.isEnabled()).isTrue();
}
@Test
public void onSwitchToggled_onlyStartsTetherWhenNeeded() {
when(mWifiManager.isWifiApEnabled()).thenReturn(true);
mController.onSwitchToggled(true);
verify(mConnectivityManager, never()).startTethering(anyInt(), anyBoolean(), any(), any());
doReturn(false).when(mWifiManager).isWifiApEnabled();
mController.onSwitchToggled(true);
verify(mConnectivityManager, times(1))
.startTethering(anyInt(), anyBoolean(), any(), any());
} }
} }