| commit | 80eadad5b1c361b9eea2983212d1302bddd9a19e | [log] [tgz] |
|---|---|---|
| author | Jayachandran C <jayachandranc@google.com> | Fri Nov 15 16:05:54 2019 -0800 |
| committer | Jayachandran Chinnakkannu <jayachandranc@google.com> | Sat Nov 16 00:55:19 2019 +0000 |
| tree | fa7ed64cb7b61589a21d677d470bb502c4ca76ee | |
| parent | af35741307cd7f7cb6971faecb005a5865c9b211 [diff] |
Remove usage of Telephonymanager from() hidden API This CL changes to use getSystemService(TelephonyManager.class) Bug: 140768340 Test: atest DataUsageControllerTest Change-Id: I377973fac09c29e9085c280c89d748e1c79c13e2
diff --git a/packages/SettingsLib/src/com/android/settingslib/net/DataUsageController.java b/packages/SettingsLib/src/com/android/settingslib/net/DataUsageController.java index ea3c1d9..092cbf3 100644 --- a/packages/SettingsLib/src/com/android/settingslib/net/DataUsageController.java +++ b/packages/SettingsLib/src/com/android/settingslib/net/DataUsageController.java
@@ -222,7 +222,8 @@ } } - return TelephonyManager.from(mContext).createForSubscriptionId(subscriptionId); + return mContext.getSystemService( + TelephonyManager.class).createForSubscriptionId(subscriptionId); } public void setMobileDataEnabled(boolean enabled) {
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/net/DataUsageControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/net/DataUsageControllerTest.java index 3da5e76..f7bee30 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/net/DataUsageControllerTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/net/DataUsageControllerTest.java
@@ -75,7 +75,7 @@ public void setUp() throws RemoteException { MockitoAnnotations.initMocks(this); when(mTelephonyManager.createForSubscriptionId(anyInt())).thenReturn(mTelephonyManager); - when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager); + when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager); when(mContext.getSystemService(Context.TELEPHONY_SUBSCRIPTION_SERVICE)) .thenReturn(mSubscriptionManager); when(mContext.getSystemService(NetworkStatsManager.class)).thenReturn(mNetworkStatsManager);