Merge "Revert "[Settings] Support getSystemService(Class<T>)"" into sc-dev am: fecfb7f5e4

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

Change-Id: If7b7aed4d406cea84e118a9b8f9c29ae6206287d
This commit is contained in:
Bonian Chen
2021-03-30 05:37:24 +00:00
committed by Automerger Merge Worker
62 changed files with 100 additions and 100 deletions

View File

@@ -74,7 +74,7 @@ public class MobileDataPreferenceControllerTest {
MockitoAnnotations.initMocks(this);
mContext = spy(ApplicationProvider.getApplicationContext());
doReturn(mTelephonyManager).when(mContext).getSystemService(TelephonyManager.class);
doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE);
when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);