Merge "[Settings] Rollback design for getSystemService(String)" am: 7a8463dbf8 am: de520dd11a

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1648047

Change-Id: I88dff2ed3675305469015351c54272ea6a0d1854
This commit is contained in:
Bonian Chen
2021-03-22 13:01:19 +00:00
committed by Automerger Merge Worker

View File

@@ -94,7 +94,7 @@ public class EnabledNetworkModePreferenceControllerTest {
when(mContext.getSystemService(CarrierConfigManager.class)).thenReturn(
mCarrierConfigManager);
when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
doReturn(mInvalidTelephonyManager).when(mTelephonyManager).createForSubscriptionId(