Merge changes I6a48d4db,I6741c41c,Ifec6bde5,Icd0717c5

* changes:
  Remove unused variables
  Return offloaded traffic when querying from TrafficStats API
  Add hardware tethering traffic in testTethering test
  Remove unused getTetherStats
This commit is contained in:
Junyu Lai
2020-11-12 08:45:15 +00:00
committed by Gerrit Code Review
3 changed files with 61 additions and 89 deletions

View File

@@ -976,11 +976,17 @@ public class TrafficStats {
}
}
// NOTE: keep these in sync with android_net_TrafficStats.cpp
private static final int TYPE_RX_BYTES = 0;
private static final int TYPE_RX_PACKETS = 1;
private static final int TYPE_TX_BYTES = 2;
private static final int TYPE_TX_PACKETS = 3;
private static final int TYPE_TCP_RX_PACKETS = 4;
private static final int TYPE_TCP_TX_PACKETS = 5;
// NOTE: keep these in sync with {@code com_android_server_net_NetworkStatsService.cpp}.
/** {@hide} */
public static final int TYPE_RX_BYTES = 0;
/** {@hide} */
public static final int TYPE_RX_PACKETS = 1;
/** {@hide} */
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;
}