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

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

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

Change-Id: Iccfaf2ad15c5915d998ec291fcddd815bae6047e
This commit is contained in:
Bonian Chen
2021-03-24 04:44:09 +00:00
committed by Automerger Merge Worker
parent f5c366f794 8debbfa8a4
commit 90bb37b6aa
63 changed files with 103 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/unit/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java
View File

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