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

Commit c893a187 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[MS47] Remove INetworkStatsSession from DataUsageController" am:... 

Merge "[MS47] Remove INetworkStatsSession from DataUsageController" am: 5d131ef4 am: 445203d3 am: 0b6cc234

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1941947

Change-Id: I4127b23df8e2f684f8d179a330c9145eb03f099c
parents 88468bd9 0b6cc234

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

+0 −10
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.settingslib.net;



import static android.net.NetworkStatsHistory.FIELD_RX_BYTES;

import static android.net.NetworkStatsHistory.FIELD_TX_BYTES;

import static android.net.TrafficStats.MB_IN_BYTES;

import static android.telephony.TelephonyManager.SIM_STATE_READY;

import static android.text.format.DateUtils.FORMAT_ABBREV_MONTH;
@@ -27,12 +25,9 @@ import android.app.usage.NetworkStats.Bucket; 
import android.app.usage.NetworkStatsManager;

import android.content.Context;

import android.net.ConnectivityManager;

import android.net.INetworkStatsService;

import android.net.INetworkStatsSession;

import android.net.NetworkPolicy;

import android.net.NetworkPolicyManager;

import android.net.NetworkTemplate;

import android.os.ServiceManager;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.text.format.DateUtils;
@@ -51,25 +46,20 @@ public class DataUsageController { 


    private static final String TAG = "DataUsageController";

    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);

    private static final int FIELDS = FIELD_RX_BYTES | FIELD_TX_BYTES;

    private static final StringBuilder PERIOD_BUILDER = new StringBuilder(50);

    private static final java.util.Formatter PERIOD_FORMATTER = new java.util.Formatter(

            PERIOD_BUILDER, Locale.getDefault());



    private final Context mContext;

    private final INetworkStatsService mStatsService;

    private final NetworkPolicyManager mPolicyManager;

    private final NetworkStatsManager mNetworkStatsManager;



    private INetworkStatsSession mSession;

    private Callback mCallback;

    private NetworkNameProvider mNetworkController;

    private int mSubscriptionId;



    public DataUsageController(Context context) {

        mContext = context;

        mStatsService = INetworkStatsService.Stub.asInterface(

                ServiceManager.getService(Context.NETWORK_STATS_SERVICE));

        mPolicyManager = NetworkPolicyManager.from(mContext);

        mNetworkStatsManager = context.getSystemService(NetworkStatsManager.class);

        mSubscriptionId = SubscriptionManager.INVALID_SUBSCRIPTION_ID;

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

+0 −12
Original line number Diff line number Diff line
@@ -18,26 +18,21 @@ package com.android.settingslib.net; 


import static com.google.common.truth.Truth.assertThat;



import static org.mockito.Mockito.any;

import static org.mockito.Mockito.anyInt;

import static org.mockito.Mockito.anyLong;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.eq;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.app.usage.NetworkStats;

import android.app.usage.NetworkStatsManager;

import android.content.Context;

import android.net.INetworkStatsSession;

import android.net.NetworkStatsHistory;

import android.net.NetworkTemplate;

import android.os.RemoteException;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.text.format.DateUtils;



import org.junit.Before;

import org.junit.Test;
@@ -53,8 +48,6 @@ public class DataUsageControllerTest { 
    private static final String SUB_ID = "Test Subscriber";

    private static final String SUB_ID_2 = "Test Subscriber 2";



    @Mock

    private INetworkStatsSession mSession;

    @Mock

    private TelephonyManager mTelephonyManager;

    @Mock
@@ -68,7 +61,6 @@ public class DataUsageControllerTest { 
    private NetworkTemplate mWifiNetworkTemplate;



    private DataUsageController mController;

    private NetworkStatsHistory mNetworkStatsHistory;

    private final int mDefaultSubscriptionId = 1234;



    @Before
@@ -80,10 +72,6 @@ public class DataUsageControllerTest { 
                .thenReturn(mSubscriptionManager);

        when(mContext.getSystemService(NetworkStatsManager.class)).thenReturn(mNetworkStatsManager);

        mController = new DataUsageController(mContext);

        mNetworkStatsHistory = spy(

                new NetworkStatsHistory(DateUtils.DAY_IN_MILLIS /* bucketDuration */));

        doReturn(mNetworkStatsHistory)

                .when(mSession).getHistoryForNetwork(any(NetworkTemplate.class), anyInt());

        ShadowSubscriptionManager.setDefaultDataSubscriptionId(mDefaultSubscriptionId);

        doReturn(SUB_ID).when(mTelephonyManager).getSubscriberId();