Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e999f22 authored by Jayachandran Chinnakkannu's avatar Jayachandran Chinnakkannu Committed by Gerrit Code Review
Browse files

Merge "Remove usage of Telephonymanager from() hidden API"

parents e21cd46d 80eadad5

packages/SettingsLib/src/com/android/settingslib/net/DataUsageController.java

+2 −1
Original line number Diff line number Diff line
@@ -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) {

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

+1 −1
Original line number Diff line number Diff line
@@ -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);