commit 09cdf4d4c5cfba5b3f278595631d9c4b6cb43b34
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jan 09 05:10:05 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 09 05:10:05 2019 +0000
tree 372b30cc71a22c6363052319942ae9d7df46e5e2
parent cee300e4d02cbb5847f6891685a14e8aecc15a90
parent 77f9cd1aa62506f38f9fef8ea99942a193880881

Merge "DO NOT MERGE: Revert: use legacy way to get tcp packet count"

services/core/java/com/android/server/net/NetworkStatsService.java

diff --git a/services/core/java/com/android/server/net/NetworkStatsService.java b/services/core/java/com/android/server/net/NetworkStatsService.java
index 8237185..383e1e0 100644
--- a/services/core/java/com/android/server/net/NetworkStatsService.java
+++ b/services/core/java/com/android/server/net/NetworkStatsService.java
@@ -955,13 +955,7 @@
 
     @Override
     public long getIfaceStats(String iface, int type) {
-        // eBPF code doesn't provide per-interface TCP counters. Use xt_qtaguid for now.
-        // TODO: delete getMobileTcp(Rx|Tx)Packets entirely. See b/110443385 .
-        if (type == TYPE_TCP_TX_PACKETS || type == TYPE_TCP_RX_PACKETS) {
-            return nativeGetIfaceStat(iface, type, false);
-        } else {
-            return nativeGetIfaceStat(iface, type, checkBpfStatsEnable());
-        }
+        return nativeGetIfaceStat(iface, type, checkBpfStatsEnable());
     }
 
     @Override