| commit | 1f5c043b0c426d7494b6a9758c380b27b695718e | [log] [tgz] |
|---|---|---|
| author | Bonian Chen <bonianchen@google.com> | Mon Mar 22 13:01:19 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Mar 22 13:01:19 2021 +0000 |
| tree | 75e96beca71a570431bea5f9981da58a1abd42f4 | |
| parent | f9f2fe3f84ab2924578cb60d5827f3d26a8b1b6a [diff] | |
| parent | de520dd11aa19dcd55dd3ecbea4e601341bea5fb [diff] |
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
diff --git a/tests/unit/src/com/android/settings/network/EnabledNetworkModePreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/EnabledNetworkModePreferenceControllerTest.java index 74db8c4..81841b7 100644 --- a/tests/unit/src/com/android/settings/network/EnabledNetworkModePreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/network/EnabledNetworkModePreferenceControllerTest.java
@@ -94,7 +94,7 @@ 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(