From f2eb3a58dd67647cdfc52b8d201801920cf876d1 Mon Sep 17 00:00:00 2001 From: Junyu Lai Date: Tue, 4 Jan 2022 03:55:28 +0000 Subject: [PATCH] [MS36] Remove unused getNetwork[Total|Uid]Bytes Since the usages are all removed, clean up the unused code accordingly. Test: TH Bug: 204830222 Change-Id: Ia6863a7098632580b411bd79550754e511ea2543 --- .../net/NetworkStatsManagerInternal.java | 8 -------- .../server/net/NetworkStatsService.java | 20 ------------------- 2 files changed, 28 deletions(-) diff --git a/packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsManagerInternal.java b/packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsManagerInternal.java index 0e9a9da6804b4..3291dbb31e73f 100644 --- a/packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsManagerInternal.java +++ b/packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsManagerInternal.java @@ -17,16 +17,8 @@ package com.android.server.net; import android.annotation.NonNull; -import android.net.NetworkStats; -import android.net.NetworkTemplate; public abstract class NetworkStatsManagerInternal { - /** Return network layer usage total for traffic that matches template. */ - public abstract long getNetworkTotalBytes(NetworkTemplate template, long start, long end); - - /** Return network layer usage per-UID for traffic that matches template. */ - public abstract NetworkStats getNetworkUidBytes(NetworkTemplate template, long start, long end); - /** Mark given UID as being in foreground for stats purposes. */ public abstract void setUidForeground(int uid, boolean uidForeground); diff --git a/packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsService.java b/packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsService.java index b99675e239342..dadc51883cad0 100644 --- a/packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsService.java +++ b/packages/ConnectivityT/service/src/com/android/server/net/NetworkStatsService.java @@ -1690,26 +1690,6 @@ public class NetworkStatsService extends INetworkStatsService.Stub { } private class NetworkStatsManagerInternalImpl extends NetworkStatsManagerInternal { - @Override - public long getNetworkTotalBytes(NetworkTemplate template, long start, long end) { - Trace.traceBegin(TRACE_TAG_NETWORK, "getNetworkTotalBytes"); - try { - return NetworkStatsService.this.getNetworkTotalBytes(template, start, end); - } finally { - Trace.traceEnd(TRACE_TAG_NETWORK); - } - } - - @Override - public NetworkStats getNetworkUidBytes(NetworkTemplate template, long start, long end) { - Trace.traceBegin(TRACE_TAG_NETWORK, "getNetworkUidBytes"); - try { - return NetworkStatsService.this.getNetworkUidBytes(template, start, end); - } finally { - Trace.traceEnd(TRACE_TAG_NETWORK); - } - } - @Override public void setUidForeground(int uid, boolean uidForeground) { NetworkStatsService.this.setUidForeground(uid, uidForeground);