[Settings] Hidden API remove - WFC mode settings
Change API from getWfcMode/setWfcMode into APIs within ImsMmTelManager. Bug: 140542283 Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingPreferenceControllerTest make RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingSettingsForSubTest make RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingSliceHelperTest atest WifiCallingSettingUiTest Change-Id: I2ee01852cb4ee90fe9db256d3333f461cc070da5
This commit is contained in:
@@ -28,7 +28,6 @@ import static org.hamcrest.CoreMatchers.allOf;
|
||||
import static org.hamcrest.CoreMatchers.anything;
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.matchers.JUnitMatchers.containsString;
|
||||
import static org.mockito.ArgumentMatchers.anyBoolean;
|
||||
import static org.mockito.ArgumentMatchers.anyString;
|
||||
import static org.mockito.Mockito.doReturn;
|
||||
|
||||
@@ -38,13 +37,13 @@ import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.support.test.uiautomator.UiDevice;
|
||||
import android.telephony.SubscriptionInfo;
|
||||
import android.telephony.ims.ImsMmTelManager;
|
||||
|
||||
import androidx.test.InstrumentationRegistry;
|
||||
import androidx.test.espresso.NoMatchingViewException;
|
||||
import androidx.test.espresso.ViewInteraction;
|
||||
import androidx.test.runner.AndroidJUnit4;
|
||||
|
||||
import com.android.ims.ImsConfig;
|
||||
import com.android.ims.ImsManager;
|
||||
import com.android.internal.telephony.SubscriptionController;
|
||||
import com.android.settings.testutils.MockedServiceManager;
|
||||
@@ -87,6 +86,10 @@ public class WifiCallingSettingUiTest {
|
||||
ImsManager mImsManager0;
|
||||
@Mock
|
||||
ImsManager mImsManager1;
|
||||
@Mock
|
||||
ImsMmTelManager mImsMmTelManager0;
|
||||
@Mock
|
||||
ImsMmTelManager mImsMmTelManager1;
|
||||
|
||||
@Before
|
||||
public void setUp() throws Exception {
|
||||
@@ -134,10 +137,10 @@ public class WifiCallingSettingUiTest {
|
||||
public void testSingleSimUi() throws InterruptedException {
|
||||
configureSingleSim();
|
||||
doReturn(true).when(mImsManager0).isWfcEnabledByUser();
|
||||
doReturn(ImsConfig.WfcModeFeatureValueConstants.WIFI_PREFERRED)
|
||||
.when(mImsManager0).getWfcMode();
|
||||
doReturn(ImsConfig.WfcModeFeatureValueConstants.WIFI_PREFERRED)
|
||||
.when(mImsManager0).getWfcMode(anyBoolean());
|
||||
doReturn(ImsMmTelManager.WIFI_MODE_WIFI_PREFERRED)
|
||||
.when(mImsMmTelManager0).getVoWiFiModeSetting();
|
||||
doReturn(ImsMmTelManager.WIFI_MODE_WIFI_PREFERRED)
|
||||
.when(mImsMmTelManager0).getVoWiFiRoamingModeSetting();
|
||||
|
||||
mInstrumentation.startActivitySync(createActivityIntent());
|
||||
|
||||
@@ -179,10 +182,10 @@ public class WifiCallingSettingUiTest {
|
||||
doReturn(false).when(mImsManager1).isWfcEnabledByPlatform();
|
||||
doReturn(false).when(mImsManager1).isNonTtyOrTtyOnVolteEnabled();
|
||||
doReturn(false).when(mImsManager0).isWfcEnabledByUser();
|
||||
doReturn(ImsConfig.WfcModeFeatureValueConstants.WIFI_PREFERRED)
|
||||
.when(mImsManager0).getWfcMode();
|
||||
doReturn(ImsConfig.WfcModeFeatureValueConstants.WIFI_PREFERRED)
|
||||
.when(mImsManager0).getWfcMode(anyBoolean());
|
||||
doReturn(ImsMmTelManager.WIFI_MODE_WIFI_PREFERRED)
|
||||
.when(mImsMmTelManager0).getVoWiFiModeSetting();
|
||||
doReturn(ImsMmTelManager.WIFI_MODE_WIFI_PREFERRED)
|
||||
.when(mImsMmTelManager0).getVoWiFiRoamingModeSetting();
|
||||
|
||||
Activity activity = mInstrumentation.startActivitySync(createActivityIntent());
|
||||
|
||||
@@ -198,10 +201,10 @@ public class WifiCallingSettingUiTest {
|
||||
public void testWfcDisabled() throws InterruptedException {
|
||||
configureSingleSim();
|
||||
doReturn(false).when(mImsManager0).isWfcEnabledByUser();
|
||||
doReturn(ImsConfig.WfcModeFeatureValueConstants.WIFI_PREFERRED)
|
||||
.when(mImsManager0).getWfcMode();
|
||||
doReturn(ImsConfig.WfcModeFeatureValueConstants.WIFI_PREFERRED)
|
||||
.when(mImsManager0).getWfcMode(anyBoolean());
|
||||
doReturn(ImsMmTelManager.WIFI_MODE_WIFI_PREFERRED)
|
||||
.when(mImsMmTelManager0).getVoWiFiModeSetting();
|
||||
doReturn(ImsMmTelManager.WIFI_MODE_WIFI_PREFERRED)
|
||||
.when(mImsMmTelManager0).getVoWiFiRoamingModeSetting();
|
||||
|
||||
Activity activity = mInstrumentation.startActivitySync(createActivityIntent());
|
||||
|
||||
@@ -218,10 +221,10 @@ public class WifiCallingSettingUiTest {
|
||||
configureDualSim();
|
||||
doReturn(true).when(mImsManager0).isWfcEnabledByUser();
|
||||
doReturn(false).when(mImsManager1).isWfcEnabledByUser();
|
||||
doReturn(ImsConfig.WfcModeFeatureValueConstants.CELLULAR_PREFERRED)
|
||||
.when(mImsManager0).getWfcMode();
|
||||
doReturn(ImsConfig.WfcModeFeatureValueConstants.CELLULAR_PREFERRED)
|
||||
.when(mImsManager0).getWfcMode(anyBoolean());
|
||||
doReturn(ImsMmTelManager.WIFI_MODE_CELLULAR_PREFERRED)
|
||||
.when(mImsMmTelManager0).getVoWiFiModeSetting();
|
||||
doReturn(ImsMmTelManager.WIFI_MODE_CELLULAR_PREFERRED)
|
||||
.when(mImsMmTelManager0).getVoWiFiRoamingModeSetting();
|
||||
|
||||
mInstrumentation.startActivitySync(createActivityIntent());
|
||||
|
||||
@@ -256,6 +259,7 @@ public class WifiCallingSettingUiTest {
|
||||
com.android.settings.Settings.WifiCallingSettingsActivity.class);
|
||||
intent.setPackage("com.android.settings");
|
||||
intent.setAction("android.intent.action.MAIN");
|
||||
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
|
||||
return intent;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user