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

Revert "[Settings] Refactor PhoneStateListener"

Browse Source 
This reverts commit e01df59027.

Reason for revert: b/163995409 | Build failure.

Change-Id: Ia413a4bae93055ceca5b6aa85602c84a8fbe5424
This commit is contained in:
Jackal Guo
2020-08-13 08:48:31 +00:00
parent e01df59027
commit 765fb8293d
3 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/robotests/src/com/android/settings/network/telephony/Enhanced4gLtePreferenceControllerTest.java
View File

@@ -67,7 +67,7 @@ public class Enhanced4gLtePreferenceControllerTest {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
doReturn(mTelephonyManager).when(mContext).getSystemService(TelephonyManager.class);
doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE);
doReturn(mSubscriptionManager).when(mContext).getSystemService(SubscriptionManager.class);
doReturn(mCarrierConfigManager).when(mContext).getSystemService(CarrierConfigManager.class);
doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);

6
tests/robotests/src/com/android/settings/network/telephony/WifiCallingPreferenceControllerTest.java
View File

@@ -76,6 +76,10 @@ public class WifiCallingPreferenceControllerTest {
mContext = spy(RuntimeEnvironment.application);
mQueryImsState = new MockWifiCallingQueryImsState(mContext, SUB_ID);
mQueryImsState.setIsEnabledByUser(true);
mQueryImsState.setIsProvisionedOnDevice(true);
mPreference = new Preference(mContext);
mController = spy(new WifiCallingPreferenceController(mContext, "wifi_calling") {
@Override
@@ -85,8 +89,8 @@ public class WifiCallingPreferenceControllerTest {
});
mController.mCarrierConfigManager = mCarrierConfigManager;
mController.init(SUB_ID);
mController.mImsManager = mImsManager;
mController.mCallState = TelephonyManager.CALL_STATE_IDLE;
doReturn(mQueryImsState).when(mController).queryImsState(anyInt());
mPreference.setKey(mController.getPreferenceKey());
when(mController.getTelephonyManager(mContext, SUB_ID)).thenReturn(mTelephonyManager);