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"

Browse Source
This commit is contained in:
Jayachandran Chinnakkannu
2019-11-18 18:38:29 +00:00
committed by Gerrit Code Review
parent e21cd46d4d 80eadad5b1
commit 8e999f22b8
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) { 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 { public void setUp() throws RemoteException {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
when(mTelephonyManager.createForSubscriptionId(anyInt())).thenReturn(mTelephonyManager); 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)) when(mContext.getSystemService(Context.TELEPHONY_SUBSCRIPTION_SERVICE))
.thenReturn(mSubscriptionManager); .thenReturn(mSubscriptionManager);
when(mContext.getSystemService(NetworkStatsManager.class)).thenReturn(mNetworkStatsManager); when(mContext.getSystemService(NetworkStatsManager.class)).thenReturn(mNetworkStatsManager);