Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[MS17.1] Remove getNetworkTotalBytes dependencies from MultipathPolicyTracker" am: a668e90292 am: 3a8216bb34 am: e602202e7d

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

Change-Id: I5fe793238684471cfb085c553c81f5f4d8c777c0
This commit is contained in:
Junyu Lai
2022-01-07 16:18:29 +00:00
committed by Automerger Merge Worker
parent 815d4cedea e602202e7d
commit 25b501c6fa
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/connectivity/MultipathPolicyTracker.java
View File

@@ -68,7 +68,6 @@ import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.IndentingPrintWriter; import com.android.internal.util.IndentingPrintWriter;
import com.android.server.LocalServices; import com.android.server.LocalServices;
import com.android.server.net.NetworkPolicyManagerInternal; import com.android.server.net.NetworkPolicyManagerInternal;
import com.android.server.net.NetworkStatsManagerInternal;
import java.time.Clock; import java.time.Clock;
import java.time.ZoneId; import java.time.ZoneId;
@@ -262,8 +261,10 @@ public class MultipathPolicyTracker {
private long getNetworkTotalBytes(long start, long end) { private long getNetworkTotalBytes(long start, long end) {
try { try {
return LocalServices.getService(NetworkStatsManagerInternal.class) final android.app.usage.NetworkStats.Bucket ret =
.getNetworkTotalBytes(mNetworkTemplate, start, end); mContext.getSystemService(NetworkStatsManager.class)
.querySummaryForDevice(mNetworkTemplate, start, end);
return ret.getRxBytes() + ret.getTxBytes();
} catch (RuntimeException e) { } catch (RuntimeException e) {
Log.w(TAG, "Failed to get data usage: " + e); Log.w(TAG, "Failed to get data usage: " + e);
return -1; return -1;