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

Commit a668e902 authored by Junyu Lai's avatar Junyu Lai Committed by Gerrit Code Review
Browse files

Merge "[MS17.1] Remove getNetworkTotalBytes dependencies from MultipathPolicyTracker"

parents 279b828f f5d70f01

services/core/java/com/android/server/connectivity/MultipathPolicyTracker.java

+4 −3
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ import com.android.internal.annotations.VisibleForTesting; 
import com.android.internal.util.IndentingPrintWriter;

import com.android.server.LocalServices;

import com.android.server.net.NetworkPolicyManagerInternal;

import com.android.server.net.NetworkStatsManagerInternal;



import java.time.Clock;

import java.time.ZoneId;
@@ -262,8 +261,10 @@ public class MultipathPolicyTracker { 


        private long getNetworkTotalBytes(long start, long end) {

            try {

                return LocalServices.getService(NetworkStatsManagerInternal.class)

                        .getNetworkTotalBytes(mNetworkTemplate, start, end);

                final android.app.usage.NetworkStats.Bucket ret =

                        mContext.getSystemService(NetworkStatsManager.class)

                        .querySummaryForDevice(mNetworkTemplate, start, end);

                return ret.getRxBytes() + ret.getTxBytes();

            } catch (RuntimeException e) {

                Log.w(TAG, "Failed to get data usage: " + e);

                return -1;