Merge "[Settings] Replace getSimCount() API"

This commit is contained in:
Bonian Chen
2019-11-13 06:45:55 +00:00
committed by Android (Google) Code Review
6 changed files with 142 additions and 110 deletions

View File

@@ -80,7 +80,7 @@ public class RoamingPreferenceControllerTest {
doReturn(mFragmentTransaction).when(mFragmentManager).beginTransaction();
mPreference = spy(new RestrictedSwitchPreference(mContext));
mController = new RoamingPreferenceController(mContext, "roaming");
mController = spy(new RoamingPreferenceController(mContext, "roaming"));
mController.init(mFragmentManager, SUB_ID);
mPreference.setKey(mController.getPreferenceKey());
}
@@ -118,7 +118,7 @@ public class RoamingPreferenceControllerTest {
@Test
public void handlePreferenceTreeClick_needDialog_showDialog() {
mController.mNeedDialog = true;
doReturn(true).when(mController).isDialogNeeded();
mController.handlePreferenceTreeClick(mPreference);

View File

@@ -83,6 +83,8 @@ public class VideoCallingPreferenceControllerTest {
doReturn(true).when(mImsManager).isVtProvisionedOnDevice();
doReturn(ImsFeature.STATE_READY).when(mImsManager).getImsServiceState();
doReturn(true).when(mTelephonyManager).isDataEnabled();
mController.mCallState = TelephonyManager.CALL_STATE_IDLE;
}
@Test