Merge "Use TetherEnabler in AllInOneTetherSettings to manage master switch"

2020-01-20 05:37:16 +00:00
parent 79ebbc5dd0 02dfed6846
commit 840db3034a
5 changed files with 175 additions and 78 deletions
--- a/tests/robotests/src/com/android/settings/network/TetherEnablerTest.java
+++ b/tests/robotests/src/com/android/settings/network/TetherEnablerTest.java
@@ -109,8 +109,10 @@ public class TetherEnablerTest {
    @Test
    public void startTether_fail_resetSwitchBar() {
        when(mNetworkPolicyManager.getRestrictBackground()).thenReturn(false);
-
+        mEnabler.onStart();
        mEnabler.startTether();
+
+        when(mConnectivityManager.getTetheredIfaces()).thenReturn(new String[0]);
        mEnabler.mOnStartTetheringCallback.onTetheringFailed();

        assertThat(mSwitchBar.isChecked()).isFalse();