[Provider Model] Implement the carrner network selection settings

- Add WifiPickerTrackerHelper to reuse the library

- User taps on carrier network preference
  - Calls MergedCarrierEntry#connect()

- User toggles mobile data On/Off
  - Calls MergedCarrierEntry#setEnabled(true/false)

Bug: 175761096
Test:
- Manual Test
- atest NetworkMobileProviderControllerTest \
        SubscriptionsPreferenceControllerTest \
        WifiPickerTrackerHelperTest

Change-Id: Ia311b10ca7a44a536556c1889ee65743af379822
This commit is contained in:
Weng Su
2021-01-04 21:54:13 +00:00
parent 88d1033150
commit 5e76c02d82
9 changed files with 332 additions and 46 deletions

View File

@@ -28,6 +28,7 @@ import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq;;
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;
@@ -59,6 +60,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.android.settings.Utils;
import com.android.settings.network.SubscriptionsPreferenceController.SubsPrefCtrlInjector;
import com.android.settings.testutils.ResourcesUtils;
import com.android.settings.wifi.WifiPickerTrackerHelper;
import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.After;
@@ -90,6 +92,8 @@ public class SubscriptionsPreferenceControllerTest {
private Lifecycle mLifecycle;
@Mock
private LifecycleOwner mLifecycleOwner;
@Mock
private WifiPickerTrackerHelper mWifiPickerTrackerHelper;
private LifecycleRegistry mLifecycleRegistry;
private int mOnChildUpdatedCount;
private Context mContext;
@@ -529,6 +533,26 @@ public class SubscriptionsPreferenceControllerTest {
assertThat(icon).isEqualTo(actualIcon);
}
@Test
public void connectCarrierNetwork_isDataEnabled_helperConnect() {
when(mTelephonyManager.isDataEnabled()).thenReturn(true);
mController.setWifiPickerTrackerHelper(mWifiPickerTrackerHelper);
mController.connectCarrierNetwork();
verify(mWifiPickerTrackerHelper).connectCarrierNetwork(any());
}
@Test
public void connectCarrierNetwork_isNotDataEnabled_helperNeverConnect() {
when(mTelephonyManager.isDataEnabled()).thenReturn(false);
mController.setWifiPickerTrackerHelper(mWifiPickerTrackerHelper);
mController.connectCarrierNetwork();
verify(mWifiPickerTrackerHelper, never()).connectCarrierNetwork(any());
}
private void setupGetIconConditions(int subId, boolean isActiveCellularNetwork,
boolean isDataEnable, int dataState, int servicestate) {
doReturn(mTelephonyManagerForSub).when(mTelephonyManager).createForSubscriptionId(subId);

View File

@@ -0,0 +1,127 @@
/*
* 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.wifi;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.os.HandlerThread;
import androidx.lifecycle.Lifecycle;
import androidx.test.core.app.ApplicationProvider;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.android.wifitrackerlib.MergedCarrierEntry;
import com.android.wifitrackerlib.WifiEntry;
import com.android.wifitrackerlib.WifiPickerTracker;
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 WifiPickerTrackerHelperTest {
@Rule
public final MockitoRule mMockitoRule = MockitoJUnit.rule();
@Mock
public WifiPickerTracker mWifiPickerTracker;
@Mock
public MergedCarrierEntry mMergedCarrierEntry;
@Mock
public WifiEntry.ConnectCallback mConnectCallback;
private WifiPickerTrackerHelper mWifiPickerTrackerHelper;
@Before
public void setUp() {
mWifiPickerTrackerHelper = new WifiPickerTrackerHelper(mock(Lifecycle.class),
ApplicationProvider.getApplicationContext(), null);
}
@Test
public void getWifiPickerTracker_returnNonNull() {
assertThat(mWifiPickerTrackerHelper.getWifiPickerTracker()).isNotNull();
}
@Test
public void onDestroy_workerThreadQuit() {
final HandlerThread workerThread = mock(HandlerThread.class);
mWifiPickerTrackerHelper.setWorkerThread(workerThread);
mWifiPickerTrackerHelper.onDestroy();
verify(workerThread).quit();
}
@Test
public void setCarrierNetworkEnabled_returnTrueAndSetEnabled() {
mWifiPickerTrackerHelper.setWifiPickerTracker(mWifiPickerTracker);
when(mWifiPickerTracker.getMergedCarrierEntry()).thenReturn(mMergedCarrierEntry);
assertThat(mWifiPickerTrackerHelper.setCarrierNetworkEnabled(true)).isTrue();
verify(mMergedCarrierEntry).setEnabled(true);
assertThat(mWifiPickerTrackerHelper.setCarrierNetworkEnabled(false)).isTrue();
verify(mMergedCarrierEntry).setEnabled(false);
}
@Test
public void setCarrierNetworkEnabled_mergedCarrierEntryIsNull_returnFalse() {
mWifiPickerTrackerHelper.setWifiPickerTracker(mWifiPickerTracker);
when(mWifiPickerTracker.getMergedCarrierEntry()).thenReturn(null);
assertThat(mWifiPickerTrackerHelper.setCarrierNetworkEnabled(true)).isFalse();
assertThat(mWifiPickerTrackerHelper.setCarrierNetworkEnabled(false)).isFalse();
}
@Test
public void connectCarrierNetwork_returnTrueAndConnect() {
mWifiPickerTrackerHelper.setWifiPickerTracker(mWifiPickerTracker);
when(mWifiPickerTracker.getMergedCarrierEntry()).thenReturn(mMergedCarrierEntry);
when(mMergedCarrierEntry.canConnect()).thenReturn(true);
assertThat(mWifiPickerTrackerHelper.connectCarrierNetwork(mConnectCallback)).isTrue();
verify(mMergedCarrierEntry).connect(mConnectCallback);
}
@Test
public void connectCarrierNetwork_mergedCarrierEntryIsNull_returnFalse() {
mWifiPickerTrackerHelper.setWifiPickerTracker(mWifiPickerTracker);
when(mWifiPickerTracker.getMergedCarrierEntry()).thenReturn(null);
assertThat(mWifiPickerTrackerHelper.connectCarrierNetwork(mConnectCallback)).isFalse();
}
@Test
public void connectCarrierNetwork_canConnectIsFalse_returnFalseAndNeverConnect() {
mWifiPickerTrackerHelper.setWifiPickerTracker(mWifiPickerTracker);
when(mWifiPickerTracker.getMergedCarrierEntry()).thenReturn(mMergedCarrierEntry);
when(mMergedCarrierEntry.canConnect()).thenReturn(false);
assertThat(mWifiPickerTrackerHelper.connectCarrierNetwork(mConnectCallback)).isFalse();
verify(mMergedCarrierEntry, never()).connect(mConnectCallback);
}
}