summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorAaron Huang <huangaaron@google.com>2021-04-01 16:45:22 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-04-01 16:45:22 +0000
commit5b1b6bf264ac9ab93e669332a10f49ed24925b69 (patch)
treef7246acdd2f18e61c9db8993fa019f2a2e52e6d2 /core/java
parent09202a93189f9f012dc01ad5fd9c33918c5c8d74 (diff)
parent40b438abccb8239ee23bc19c3b4f34f0dd13bd8e (diff)
Merge "Move some constants from TrafficStatsConstants to NetworkStackConstants" am: e427565991 am: 40b438abcc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625861 Change-Id: Ideb5a5abbd074a8c905861e902977c442317fc02
Diffstat (limited to 'core/java')
-rw-r--r--core/java/com/android/internal/util/TrafficStatsConstants.java16
1 files changed, 0 insertions, 16 deletions
diff --git a/core/java/com/android/internal/util/TrafficStatsConstants.java b/core/java/com/android/internal/util/TrafficStatsConstants.java
index 413be484dc32..131114cad460 100644
--- a/core/java/com/android/internal/util/TrafficStatsConstants.java
+++ b/core/java/com/android/internal/util/TrafficStatsConstants.java
@@ -21,24 +21,8 @@ package com.android.internal.util;
* @hide
*/
public class TrafficStatsConstants {
- // These tags are used by the network stack to do traffic for its own purposes. Traffic
- // tagged with these will be counted toward the network stack and must stay inside the
- // range defined by
- // {@link android.net.TrafficStats#TAG_NETWORK_STACK_RANGE_START} and
- // {@link android.net.TrafficStats#TAG_NETWORK_STACK_RANGE_END}.
- public static final int TAG_SYSTEM_DHCP = 0xFFFFFE01;
- public static final int TAG_SYSTEM_NEIGHBOR = 0xFFFFFE02;
- public static final int TAG_SYSTEM_DHCP_SERVER = 0xFFFFFE03;
public static final int TAG_SYSTEM_NTP = 0xFFFFFF41;
public static final int TAG_SYSTEM_GPS = 0xFFFFFF44;
public static final int TAG_SYSTEM_PAC = 0xFFFFFF45;
-
- // These tags are used by the network stack to do traffic on behalf of apps. Traffic
- // tagged with these will be counted toward the app on behalf of which the network
- // stack is doing this traffic. These values must stay inside the range defined by
- // {@link android.net.TrafficStats#TAG_NETWORK_STACK_IMPERSONATION_RANGE_START} and
- // {@link android.net.TrafficStats#TAG_NETWORK_STACK_IMPERSONATION_RANGE_END}.
- public static final int TAG_SYSTEM_PROBE = 0xFFFFFF81;
- public static final int TAG_SYSTEM_DNS = 0xFFFFFF82;
}