LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge changes I6a48d4db,I6741c41c,Ifec6bde5,Icd0717c5 am: 07cfc92259 am: 24d691f04d am: 10656c3c44 am: bff31f6f47

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

Change-Id: I2c5895c223a5843cfe11a1736a243b6847ad1b9a
This commit is contained in:
Junyu Lai
2020-11-12 10:19:29 +00:00
committed by Automerger Merge Worker
parent e6794fe61c bff31f6f47
commit 2978147703
3 changed files with 61 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/java/android/net/TrafficStats.java
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;
}