Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37ccd235 authored by Mingguang Xu's avatar Mingguang Xu Committed by Automerger Merge Worker
Browse files

Merge "Set Wifi scoring status when Adaptive Connectivity toggle status...

Merge "Set Wifi scoring status when Adaptive Connectivity toggle status changes" into sc-dev am: 9a46cfcf

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id97a09f88b1480500e267456e6e8727a2c7e4865
parents f23dcc77 9a46cfcf
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@
package com.android.settings.network;

import android.content.Context;
import android.net.wifi.WifiManager;
import android.provider.Settings;

import androidx.preference.PreferenceScreen;
@@ -28,8 +29,11 @@ import com.android.settings.core.TogglePreferenceController;
 */
public class AdaptiveConnectivityTogglePreferenceController extends TogglePreferenceController {

    private final WifiManager mWifiManager;

    public AdaptiveConnectivityTogglePreferenceController(Context context, String preferenceKey) {
        super(context, preferenceKey);
        mWifiManager = context.getSystemService(WifiManager.class);
    }

    @Override
@@ -53,6 +57,7 @@ public class AdaptiveConnectivityTogglePreferenceController extends TogglePrefer
        Settings.Secure.putInt(mContext.getContentResolver(),
                Settings.Secure.ADAPTIVE_CONNECTIVITY_ENABLED,
                isChecked ? 1 : 0);
        mWifiManager.setWifiScoringEnabled(isChecked);
        return true;
    }
}
+12 −0
Original line number Diff line number Diff line
@@ -19,8 +19,13 @@ package com.android.settings.network;
import static com.google.common.truth.Truth.assertThat;

import static org.mockito.Answers.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;

import android.content.Context;
import android.net.wifi.WifiManager;
import android.provider.Settings;

import org.junit.Before;
@@ -29,6 +34,7 @@ import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;

@RunWith(RobolectricTestRunner.class)
public class AdaptiveConnectivityTogglePreferenceControllerTest {
@@ -37,12 +43,16 @@ public class AdaptiveConnectivityTogglePreferenceControllerTest {

    @Mock(answer = RETURNS_DEEP_STUBS)
    private Context mContext;
    @Mock
    WifiManager mWifiManager;

    private AdaptiveConnectivityTogglePreferenceController mController;

    @Before
    public void setUp() {
        MockitoAnnotations.initMocks(this);
        mContext = spy(RuntimeEnvironment.application);
        when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager);
        mController = new AdaptiveConnectivityTogglePreferenceController(mContext, PREF_KEY);
    }

@@ -61,6 +71,7 @@ public class AdaptiveConnectivityTogglePreferenceControllerTest {
        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
                Settings.Secure.ADAPTIVE_CONNECTIVITY_ENABLED, 1))
                .isEqualTo(1);
        verify(mWifiManager, atLeastOnce()).setWifiScoringEnabled(true);
    }

    @Test
@@ -73,5 +84,6 @@ public class AdaptiveConnectivityTogglePreferenceControllerTest {
        assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
                Settings.Secure.ADAPTIVE_CONNECTIVITY_ENABLED, 1))
                .isEqualTo(0);
        verify(mWifiManager).setWifiScoringEnabled(false);
    }
}