[Provider Model] Carrie Wi-Fi offload toggle request
- Remove the Advanced expandable list pattern and expose the items - Add Carrie Wi-Fi offload toggle preference - Add Carrier Wi-Fi network preference - Do not set Carrier Network together when setting Mobile Data, if carrner network provision enabled. - Screenshot: https://screenshot.googleplex.com/8vMow53cvGfUAoj Bug: 182324921 Test: manual test atest -c CarrierWifiTogglePreferenceControllerTest \ MobileDataPreferenceControllerTest \ WifiPickerTrackerHelperTest Change-Id: I5a7f4cc6850fe76c0efee392c0c0c23cb41f5e1e
This commit is contained in:
Weng Su
@@ -0,0 +1,183 @@
|
||||
/*
|
||||
* Copyright (C) 2021 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.settings.network;
|
||||
|
||||
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
|
||||
import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.Mockito.doReturn;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.verify;
|
||||
|
||||
import android.content.Context;
|
||||
import android.os.Looper;
|
||||
|
||||
import androidx.lifecycle.Lifecycle;
|
||||
import androidx.preference.Preference;
|
||||
import androidx.preference.PreferenceManager;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4;
|
||||
|
||||
import com.android.settings.wifi.WifiPickerTrackerHelper;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.junit.MockitoJUnit;
|
||||
import org.mockito.junit.MockitoRule;
|
||||
|
||||
@RunWith(AndroidJUnit4.class)
|
||||
public class CarrierWifiTogglePreferenceControllerTest {
|
||||
|
||||
private static final int SUB_ID = 2;
|
||||
private static final String SSID = "ssid";
|
||||
|
||||
@Rule
|
||||
public final MockitoRule mMockitoRule = MockitoJUnit.rule();
|
||||
@Mock
|
||||
public WifiPickerTrackerHelper mWifiPickerTrackerHelper;
|
||||
|
||||
private Context mContext;
|
||||
private CarrierWifiTogglePreferenceController mController;
|
||||
private PreferenceScreen mScreen;
|
||||
private Preference mTogglePreference;
|
||||
private Preference mNetworkPreference;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
mContext = spy(ApplicationProvider.getApplicationContext());
|
||||
|
||||
mController = new CarrierWifiTogglePreferenceController(mContext,
|
||||
CarrierWifiTogglePreferenceController.CARRIER_WIFI_TOGGLE_PREF_KEY);
|
||||
mController.init(mock(Lifecycle.class), SUB_ID);
|
||||
mController.mIsProviderModelEnabled = true;
|
||||
mController.mIsCarrierProvisionWifiEnabled = true;
|
||||
doReturn(SSID).when(mWifiPickerTrackerHelper).getCarrierNetworkSsid();
|
||||
mController.mWifiPickerTrackerHelper = mWifiPickerTrackerHelper;
|
||||
if (Looper.myLooper() == null) {
|
||||
Looper.prepare();
|
||||
}
|
||||
final PreferenceManager preferenceManager = new PreferenceManager(mContext);
|
||||
mScreen = preferenceManager.createPreferenceScreen(mContext);
|
||||
mTogglePreference = new Preference(mContext);
|
||||
mTogglePreference.setKey(
|
||||
CarrierWifiTogglePreferenceController.CARRIER_WIFI_TOGGLE_PREF_KEY);
|
||||
mScreen.addPreference(mTogglePreference);
|
||||
mNetworkPreference = new Preference(mContext);
|
||||
mNetworkPreference.setKey(
|
||||
CarrierWifiTogglePreferenceController.CARRIER_WIFI_NETWORK_PREF_KEY);
|
||||
mScreen.addPreference(mNetworkPreference);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getAvailabilityStatus_providerModelDisable_returnUnavailable() {
|
||||
mController.mIsProviderModelEnabled = false;
|
||||
|
||||
assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getAvailabilityStatus_carrierProvisionWifiEnabled_returnAvailable() {
|
||||
mController.mIsCarrierProvisionWifiEnabled = true;
|
||||
|
||||
assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getAvailabilityStatus_carrierProvisionWifiDisabled_returnUnavailable() {
|
||||
mController.mIsCarrierProvisionWifiEnabled = false;
|
||||
|
||||
assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void isChecked_carrierNetworkEnabled_returnTrue() {
|
||||
doReturn(true).when(mWifiPickerTrackerHelper).isCarrierNetworkEnabled(SUB_ID);
|
||||
|
||||
assertThat(mController.isChecked()).isEqualTo(true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void isChecked_carrierNetworkDisabled_returnFalse() {
|
||||
doReturn(false).when(mWifiPickerTrackerHelper).isCarrierNetworkEnabled(SUB_ID);
|
||||
|
||||
assertThat(mController.isChecked()).isEqualTo(false);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setChecked_checked_shouldSetCarrierNetworkEnabled() {
|
||||
mController.setChecked(true);
|
||||
|
||||
verify(mWifiPickerTrackerHelper).setCarrierNetworkEnabled(true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setChecked_unchecked_shouldSetCarrierNetworkDisabled() {
|
||||
mController.setChecked(false);
|
||||
|
||||
verify(mWifiPickerTrackerHelper).setCarrierNetworkEnabled(false);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void displayPreference_carrierNetworkEnabled_showCarrierNetwork() {
|
||||
doReturn(true).when(mWifiPickerTrackerHelper).isCarrierNetworkEnabled(SUB_ID);
|
||||
|
||||
mController.displayPreference(mScreen);
|
||||
|
||||
assertThat(mController.mCarrierNetworkPreference).isEqualTo(mNetworkPreference);
|
||||
assertThat(mNetworkPreference.isVisible()).isTrue();
|
||||
assertThat(mNetworkPreference.getSummary()).isEqualTo(SSID);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void displayPreference_carrierNetworkDisabled_hideCarrierNetwork() {
|
||||
doReturn(false).when(mWifiPickerTrackerHelper).isCarrierNetworkEnabled(SUB_ID);
|
||||
|
||||
mController.displayPreference(mScreen);
|
||||
|
||||
assertThat(mController.mCarrierNetworkPreference).isEqualTo(mNetworkPreference);
|
||||
assertThat(mNetworkPreference.isVisible()).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onWifiStateChanged_carrierNetworkVisible_shouldSetSummary() {
|
||||
mController.mCarrierNetworkPreference = mNetworkPreference;
|
||||
mNetworkPreference.setVisible(true);
|
||||
mNetworkPreference.setSummary(null);
|
||||
|
||||
mController.onWifiEntriesChanged();
|
||||
|
||||
assertThat(mNetworkPreference.getSummary()).isEqualTo(SSID);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void onWifiEntriesChanged_carrierNetworkVisible_shouldSetSummary() {
|
||||
mController.mCarrierNetworkPreference = mNetworkPreference;
|
||||
mNetworkPreference.setVisible(true);
|
||||
mNetworkPreference.setSummary(null);
|
||||
|
||||
mController.onWifiEntriesChanged();
|
||||
|
||||
assertThat(mNetworkPreference.getSummary()).isEqualTo(SSID);
|
||||
}
|
||||
}
|
||||
@@ -20,12 +20,18 @@ import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.anyLong;
|
||||
import static org.mockito.Mockito.doReturn;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.never;
|
||||
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.os.HandlerThread;
|
||||
import android.os.PersistableBundle;
|
||||
import android.telephony.CarrierConfigManager;
|
||||
|
||||
import androidx.lifecycle.Lifecycle;
|
||||
import androidx.test.core.app.ApplicationProvider;
|
||||
@@ -47,9 +53,15 @@ import org.mockito.junit.MockitoRule;
|
||||
@RunWith(AndroidJUnit4.class)
|
||||
public class WifiPickerTrackerHelperTest {
|
||||
|
||||
private static final int SUB_ID = 2;
|
||||
|
||||
@Rule
|
||||
public final MockitoRule mMockitoRule = MockitoJUnit.rule();
|
||||
@Mock
|
||||
public WifiManager mWifiManager;
|
||||
@Mock
|
||||
public CarrierConfigManager mCarrierConfigManager;
|
||||
@Mock
|
||||
public WifiPickerTracker mWifiPickerTracker;
|
||||
@Mock
|
||||
public MergedCarrierEntry mMergedCarrierEntry;
|
||||
@@ -59,16 +71,24 @@ public class WifiPickerTrackerHelperTest {
|
||||
private WifiPickerTrackerHelper mWifiPickerTrackerHelper;
|
||||
|
||||
private FakeFeatureFactory mFeatureFactory;
|
||||
private PersistableBundle mCarrierConfig;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
final Context context = spy(ApplicationProvider.getApplicationContext());
|
||||
when(context.getSystemService(WifiManager.class)).thenReturn(mWifiManager);
|
||||
when(context.getSystemService(CarrierConfigManager.class))
|
||||
.thenReturn(mCarrierConfigManager);
|
||||
mCarrierConfig = new PersistableBundle();
|
||||
doReturn(mCarrierConfig).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
|
||||
|
||||
mFeatureFactory = FakeFeatureFactory.setupForTest();
|
||||
when(mFeatureFactory.wifiTrackerLibProvider
|
||||
.createWifiPickerTracker(
|
||||
any(), any(), any(), any(), any(), anyLong(), anyLong(), any()))
|
||||
.thenReturn(mWifiPickerTracker);
|
||||
mWifiPickerTrackerHelper = new WifiPickerTrackerHelper(mock(Lifecycle.class),
|
||||
ApplicationProvider.getApplicationContext(), null);
|
||||
context, null);
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -87,24 +107,63 @@ public class WifiPickerTrackerHelperTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setCarrierNetworkEnabled_returnTrueAndSetEnabled() {
|
||||
public void isCarrierNetworkProvisionEnabled_getNullConfig_returnFalse() {
|
||||
doReturn(null).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
|
||||
|
||||
assertThat(mWifiPickerTrackerHelper.isCarrierNetworkProvisionEnabled(SUB_ID)).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void isCarrierNetworkProvisionEnabled_returnCorrect() {
|
||||
mCarrierConfig.putBoolean(
|
||||
CarrierConfigManager.KEY_CARRIER_PROVISIONS_WIFI_MERGED_NETWORKS_BOOL, true);
|
||||
|
||||
assertThat(mWifiPickerTrackerHelper.isCarrierNetworkProvisionEnabled(SUB_ID)).isTrue();
|
||||
|
||||
mCarrierConfig.putBoolean(
|
||||
CarrierConfigManager.KEY_CARRIER_PROVISIONS_WIFI_MERGED_NETWORKS_BOOL, false);
|
||||
|
||||
assertThat(mWifiPickerTrackerHelper.isCarrierNetworkProvisionEnabled(SUB_ID)).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void isCarrierNetworkEnabled_returnCorrect() {
|
||||
doReturn(true).when(mWifiManager).isCarrierNetworkOffloadEnabled(SUB_ID, true /* merged */);
|
||||
|
||||
assertThat(mWifiPickerTrackerHelper.isCarrierNetworkEnabled(SUB_ID)).isTrue();
|
||||
|
||||
doReturn(false).when(mWifiManager)
|
||||
.isCarrierNetworkOffloadEnabled(SUB_ID, true /* merged */);
|
||||
|
||||
assertThat(mWifiPickerTrackerHelper.isCarrierNetworkEnabled(SUB_ID)).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setCarrierNetworkEnabled_shouldSetCorrect() {
|
||||
mWifiPickerTrackerHelper.setWifiPickerTracker(mWifiPickerTracker);
|
||||
when(mWifiPickerTracker.getMergedCarrierEntry()).thenReturn(mMergedCarrierEntry);
|
||||
|
||||
assertThat(mWifiPickerTrackerHelper.setCarrierNetworkEnabled(true)).isTrue();
|
||||
mWifiPickerTrackerHelper.setCarrierNetworkEnabled(true);
|
||||
|
||||
verify(mMergedCarrierEntry).setEnabled(true);
|
||||
|
||||
assertThat(mWifiPickerTrackerHelper.setCarrierNetworkEnabled(false)).isTrue();
|
||||
mWifiPickerTrackerHelper.setCarrierNetworkEnabled(false);
|
||||
|
||||
verify(mMergedCarrierEntry).setEnabled(false);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setCarrierNetworkEnabled_mergedCarrierEntryIsNull_returnFalse() {
|
||||
public void setCarrierNetworkEnabled_mergedCarrierEntryIsNull_shouldNotSet() {
|
||||
mWifiPickerTrackerHelper.setWifiPickerTracker(mWifiPickerTracker);
|
||||
when(mWifiPickerTracker.getMergedCarrierEntry()).thenReturn(null);
|
||||
|
||||
assertThat(mWifiPickerTrackerHelper.setCarrierNetworkEnabled(true)).isFalse();
|
||||
assertThat(mWifiPickerTrackerHelper.setCarrierNetworkEnabled(false)).isFalse();
|
||||
mWifiPickerTrackerHelper.setCarrierNetworkEnabled(true);
|
||||
|
||||
verify(mMergedCarrierEntry, never()).setEnabled(true);
|
||||
|
||||
mWifiPickerTrackerHelper.setCarrierNetworkEnabled(false);
|
||||
|
||||
verify(mMergedCarrierEntry, never()).setEnabled(true);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
Reference in New Issue
Block a user