Merge "[MS47] Remove INetworkStatsSession from DataUsageController" am: 5d131ef4

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;

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;

    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;

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;

    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

    private NetworkTemplate mWifiNetworkTemplate;

    private DataUsageController mController;

    private NetworkStatsHistory mNetworkStatsHistory;

    private final int mDefaultSubscriptionId = 1234;

    @Before

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