Merge "Add SocketUtils for NetworkStack" am: d9cc11e8bd

am: 4d301b8d85

Change-Id: I89fe62b4baf63104359bb6741807bb2f1666cdd9
This commit is contained in:
Remi NGUYEN VAN
2019-01-28 22:57:39 -08:00
committed by android-build-merger

View File

@@ -128,10 +128,14 @@ public class TrafficStats {
public static final int TAG_SYSTEM_APP = 0xFFFFFF05;
/** @hide */
@SystemApi
@TestApi
public static final int TAG_SYSTEM_DHCP = 0xFFFFFF40;
/** @hide */
public static final int TAG_SYSTEM_NTP = 0xFFFFFF41;
/** @hide */
@SystemApi
@TestApi
public static final int TAG_SYSTEM_PROBE = 0xFFFFFF42;
/** @hide */
public static final int TAG_SYSTEM_NEIGHBOR = 0xFFFFFF43;
@@ -140,6 +144,8 @@ public class TrafficStats {
/** @hide */
public static final int TAG_SYSTEM_PAC = 0xFFFFFF45;
/** @hide */
@SystemApi
@TestApi
public static final int TAG_SYSTEM_DHCP_SERVER = 0xFFFFFF46;
private static INetworkStatsService sStatsService;