Merge "StrictMode to detect untagged network traffic." am: 0bb7880e77 am: bc9c6a91b9 am: 8cbc5e3eac

am: 55727aaede

Change-Id: I272964fc9c2a9e350bacc0586dd6b2d4a23c5f51
This commit is contained in:
Jeff Sharkey
2016-11-21 23:05:12 +00:00
committed by android-build-merger

View File

@@ -108,6 +108,26 @@ public class TrafficStats {
*/ */
public static final int TAG_SYSTEM_RESTORE = 0xFFFFFF04; public static final int TAG_SYSTEM_RESTORE = 0xFFFFFF04;
/** @hide */
public static final int TAG_SYSTEM_DHCP = 0xFFFFFF05;
/** @hide */
public static final int TAG_SYSTEM_NTP = 0xFFFFFF06;
/** @hide */
public static final int TAG_SYSTEM_PROBE = 0xFFFFFF07;
/** @hide */
public static final int TAG_SYSTEM_NEIGHBOR = 0xFFFFFF08;
/** @hide */
public static final int TAG_SYSTEM_GPS = 0xFFFFFF09;
/** @hide */
public static final int TAG_SYSTEM_PAC = 0xFFFFFF0A;
/**
* Sockets that are strictly local on device; never hits network.
*
* @hide
*/
public static final int TAG_SYSTEM_LOCAL = 0xFFFFFFAA;
private static INetworkStatsService sStatsService; private static INetworkStatsService sStatsService;
private synchronized static INetworkStatsService getStatsService() { private synchronized static INetworkStatsService getStatsService() {