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

Commit 8b416f02 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

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

Merge "Merge "Remove usage of Telephonymanager from() hidden API" am: 8e999f22 am: fc8b731e am: 4931429f"
parents 82865f85 ef5ac8fb

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);