commit 359dacfd266f58fc28ffe16fe6944e24e40f43a3
author Maciej Żenczykowski <maze@google.com> Fri Aug 18 14:49:40 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 18 14:49:40 2023 +0000
tree 2f7da1cbc040413db30056adae6e7410f67df480
parent b4870c4ce202dbcdbdbf7358cda545e4c22c90fd
parent 6f0ec43200c61bec13582e9abba2ecf65ed5a662

Merge "remove unused TcpTx/RxPackets java & jni constants" into main

framework-t/src/android/net/TrafficStats.java

diff --git a/framework-t/src/android/net/TrafficStats.java b/framework-t/src/android/net/TrafficStats.java
index 41cf63f..a69b38d 100644
--- a/framework-t/src/android/net/TrafficStats.java
+++ b/framework-t/src/android/net/TrafficStats.java
@@ -1121,8 +1121,4 @@
     public static final int TYPE_TX_BYTES = 2;
     /** {@hide} */
     public static final int TYPE_TX_PACKETS = 3;
-    /** {@hide} */
-    public static final int TYPE_TCP_RX_PACKETS = 4;
-    /** {@hide} */
-    public static final int TYPE_TCP_TX_PACKETS = 5;
 }

service-t/jni/com_android_server_net_NetworkStatsService.cpp

diff --git a/service-t/jni/com_android_server_net_NetworkStatsService.cpp b/service-t/jni/com_android_server_net_NetworkStatsService.cpp
index 4a6e733..bdbb655 100644
--- a/service-t/jni/com_android_server_net_NetworkStatsService.cpp
+++ b/service-t/jni/com_android_server_net_NetworkStatsService.cpp
@@ -47,8 +47,6 @@
     RX_PACKETS = 1,
     TX_BYTES = 2,
     TX_PACKETS = 3,
-    TCP_RX_PACKETS = 4,  // not supported, always returns UNKNOWN (-1)
-    TCP_TX_PACKETS = 5,  // not supported, always returns UNKNOWN (-1)
 };
 
 static uint64_t getStatsType(StatsValue* stats, StatsType type) {
@@ -61,8 +59,6 @@
             return stats->txBytes;
         case TX_PACKETS:
             return stats->txPackets;
-        case TCP_RX_PACKETS:
-        case TCP_TX_PACKETS:
         default:
             return UNKNOWN;
     }