Merge "Fix inconsistent data usage cycle start time."

import android.app.usage.NetworkStats;

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.text.format.DateUtils;

import android.util.Pair;

import androidx.annotation.VisibleForTesting;

import androidx.loader.content.AsyncTaskLoader;

import com.android.settingslib.NetworkPolicyEditor;

import java.time.ZonedDateTime;

import java.util.Iterator;

import androidx.annotation.VisibleForTesting;

import androidx.loader.content.AsyncTaskLoader;

/**

 * Loader for network data usage history. It returns a list of usage data per billing cycle.

 */

            long cycleEnd = historyEnd;

            while (cycleEnd > historyStart) {

                final long cycleStart = Math.max(

                    historyStart, cycleEnd - (DateUtils.WEEK_IN_MILLIS * 4));

                final long cycleStart = cycleEnd - (DateUtils.WEEK_IN_MILLIS * 4);

                recordUsage(cycleStart, cycleEnd);

                cycleEnd = cycleStart;

            }

            .thenReturn(networkHistory);

        final long now = System.currentTimeMillis();

        final long fourWeeksAgo = now - (DateUtils.WEEK_IN_MILLIS * 4);

        when(networkHistory.getStart()).thenReturn(fourWeeksAgo);

        final long twoDaysAgo = now - (DateUtils.DAY_IN_MILLIS * 2);

        when(networkHistory.getStart()).thenReturn(twoDaysAgo);

        when(networkHistory.getEnd()).thenReturn(now);

        mLoader.loadFourWeeksData();