Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove usage of Telephonymanager from() hidden API" am: 8e999f22b8

Browse Source 
am: fc8b731e33

Change-Id: I196f28a694fc0c8ec35256938a53d2d093e263c1
This commit is contained in:
Jayachandran Chinnakkannu
2019-11-18 10:57:56 -08:00
committed by android-build-merger
parent 3546417053 fc8b731e33
commit 4931429f5a
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SettingsLib/src/com/android/settingslib/net/DataUsageController.java
View File

@@ -222,7 +222,8 @@ public class DataUsageController {
}
}
return TelephonyManager.from(mContext).createForSubscriptionId(subscriptionId);
return mContext.getSystemService(
TelephonyManager.class).createForSubscriptionId(subscriptionId);
}
public void setMobileDataEnabled(boolean enabled) {

2
packages/SettingsLib/tests/robotests/src/com/android/settingslib/net/DataUsageControllerTest.java
View File

@@ -75,7 +75,7 @@ public class DataUsageControllerTest {
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);