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

Merge "[Wi-Fi] Control Wi-Fi Hotspot Settings using onClick instead of onSwitchToggled" into rvc-dev am: 29063e3779 am: ff11b08361 am: 241f426e36 am: dcbe174ab5

Browse Source 
Change-Id: I3a449473066ae36f13cae1f36f9a2ace98836f83
This commit is contained in:
Automerger Merge Worker
2020-03-07 23:18:44 +00:00
parent 7e1c9610d4 dcbe174ab5
commit c4e1408a30
3 changed files with 28 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,10 +32,8 @@ import android.content.Context;
import android.net.ConnectivityManager;
import android.net.NetworkPolicyManager;
import android.net.wifi.WifiManager;
import android.provider.Settings;
import com.android.settings.widget.SwitchBar;
import com.android.settings.widget.SwitchBarController;
import org.junit.Before;
import org.junit.Test;
@@ -70,10 +68,9 @@ public class WifiTetherSwitchBarControllerTest {
when(mContext.getSystemService(Context.NETWORK_POLICY_SERVICE)).thenReturn(
mNetworkPolicyManager);
mController = new WifiTetherSwitchBarController(mContext,
new SwitchBarController(mSwitchBar));
mController = new WifiTetherSwitchBarController(mContext, mSwitchBar);
}
@Test
public void startTether_fail_resetSwitchBar() {
when(mNetworkPolicyManager.getRestrictBackground()).thenReturn(false);
@@ -103,12 +100,12 @@ public class WifiTetherSwitchBarControllerTest {
@Test
public void onSwitchToggled_onlyStartsTetherWhenNeeded() {
when(mWifiManager.isWifiApEnabled()).thenReturn(true);
mController.onSwitchToggled(true);
mController.onClick(mSwitchBar.getSwitch());
verify(mConnectivityManager, never()).startTethering(anyInt(), anyBoolean(), any(), any());
doReturn(false).when(mWifiManager).isWifiApEnabled();
mController.onSwitchToggled(true);
mController.onClick(mSwitchBar.getSwitch());
verify(mConnectivityManager, times(1))
.startTethering(anyInt(), anyBoolean(), any(), any());