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

[Provider Model] Carrie Wi-Fi offload toggle request (panel)

Browse Source 
- Do not set Carrier Network together when setting Mobile Data, if
carrner network provision enabled.

Bug: 182324921
Test: manual test
atest -c ProviderModelSliceTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiScanWorkerTest

Change-Id: Ic8b77fd7b43372f077ba1c8be8fd9a7c3bcff197
This commit is contained in:
Weng Su
2021-04-20 22:27:44 +08:00
parent aeb6200bfe
commit a320fb12a1
4 changed files with 46 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/unit/src/com/android/settings/network/ProviderModelSliceTest.java
View File

@@ -70,6 +70,7 @@ public class ProviderModelSliceTest {
private static final Uri PROVIDER_MODEL_SLICE_URI =
Uri.parse("content://com.android.settings.slices/action/provider_model");
private static final int MOCK_SLICE_LEVEL = 3;
private static final int SUB_ID = 2;
private Context mContext;
private MockProviderModelSlice mMockProviderModelSlice;
@@ -359,23 +360,23 @@ public class ProviderModelSliceTest {
@Test
public void doCarrierNetworkAction_toggleActionSetDataEnabled_setCarrierNetworkEnabledTrue() {
mMockProviderModelSlice.doCarrierNetworkAction(true /* isToggleAction */,
true /* isDataEnabled */);
true /* isDataEnabled */, SUB_ID);
verify(mMockNetworkProviderWorker).setCarrierNetworkEnabled(true);
verify(mMockNetworkProviderWorker).setCarrierNetworkEnabledIfNeeded(true, SUB_ID);
}
@Test
public void doCarrierNetworkAction_toggleActionSetDataDisabled_setCarrierNetworkEnabledFalse() {
mMockProviderModelSlice.doCarrierNetworkAction(true /* isToggleAction */,
false /* isDataEnabled */);
false /* isDataEnabled */, SUB_ID);
verify(mMockNetworkProviderWorker).setCarrierNetworkEnabled(false);
verify(mMockNetworkProviderWorker).setCarrierNetworkEnabledIfNeeded(false, SUB_ID);
}
@Test
public void doCarrierNetworkAction_primaryActionAndDataEnabled_connectCarrierNetwork() {
mMockProviderModelSlice.doCarrierNetworkAction(false /* isToggleAction */,
true /* isDataEnabled */);
true /* isDataEnabled */, SUB_ID);
verify(mMockNetworkProviderWorker).connectCarrierNetwork();
}
@@ -383,7 +384,7 @@ public class ProviderModelSliceTest {
@Test
public void doCarrierNetworkAction_primaryActionAndDataDisabled_notConnectCarrierNetwork() {
mMockProviderModelSlice.doCarrierNetworkAction(false /* isToggleAction */,
false /* isDataEnabled */);
false /* isDataEnabled */, SUB_ID);
verify(mMockNetworkProviderWorker, never()).connectCarrierNetwork();
}