From 42951ddb37e465926b9a56f755b2f7aa9526e011 Mon Sep 17 00:00:00 2001 From: Aaron Huang Date: Wed, 10 Mar 2021 19:17:37 +0800 Subject: Move some constants from TrafficStatsConstants to NetworkStackConstants Keep the constants are only used by framework in TrafficStatsConstants and move the others to NetworkStackConstants which is in libs/net. Bug: 182349970 Test: FrameworksNetTests NetworkStackTests TetheringTests Change-Id: Ib667c115e5f1e01237d88b77bba753363da309cc Merged-In: Ib667c115e5f1e01237d88b77bba753363da309cc --- Android.bp | 2 -- .../com/android/internal/util/TrafficStatsConstants.java | 16 ---------------- .../carrierdefaultapp/CaptivePortalLoginActivity.java | 4 ++-- .../android/server/connectivity/NetworkDiagnostics.java | 6 +++--- 4 files changed, 5 insertions(+), 23 deletions(-) diff --git a/Android.bp b/Android.bp index d40f11598553..a1687dfd8c6d 100644 --- a/Android.bp +++ b/Android.bp @@ -820,7 +820,6 @@ filegroup { "core/java/com/android/internal/util/RingBufferIndices.java", "core/java/com/android/internal/util/State.java", "core/java/com/android/internal/util/StateMachine.java", - "core/java/com/android/internal/util/TrafficStatsConstants.java", "core/java/com/android/internal/util/WakeupMessage.java", "core/java/com/android/internal/util/TokenBucket.java", ], @@ -846,7 +845,6 @@ filegroup { "core/java/com/android/internal/util/MessageUtils.java", "core/java/com/android/internal/util/State.java", "core/java/com/android/internal/util/StateMachine.java", - "core/java/com/android/internal/util/TrafficStatsConstants.java", "core/java/com/android/internal/util/WakeupMessage.java", ], } 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; } diff --git a/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java b/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java index 6fab9e4641b6..5afe0b5d64bc 100644 --- a/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java +++ b/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java @@ -50,7 +50,7 @@ import android.widget.ProgressBar; import android.widget.TextView; import com.android.internal.util.ArrayUtils; -import com.android.internal.util.TrafficStatsConstants; +import com.android.net.module.util.NetworkStackConstants; import java.io.IOException; import java.lang.reflect.Field; @@ -239,7 +239,7 @@ public class CaptivePortalLoginActivity extends Activity { HttpURLConnection urlConnection = null; int httpResponseCode = 500; int oldTag = TrafficStats.getAndSetThreadStatsTag( - TrafficStatsConstants.TAG_SYSTEM_PROBE); + NetworkStackConstants.TAG_SYSTEM_PROBE); try { urlConnection = (HttpURLConnection) mNetwork.openConnection( new URL(mCm.getCaptivePortalServerUrl())); diff --git a/services/core/java/com/android/server/connectivity/NetworkDiagnostics.java b/services/core/java/com/android/server/connectivity/NetworkDiagnostics.java index 5e6b9f39b40a..2e51be39bfae 100644 --- a/services/core/java/com/android/server/connectivity/NetworkDiagnostics.java +++ b/services/core/java/com/android/server/connectivity/NetworkDiagnostics.java @@ -36,7 +36,7 @@ import android.text.TextUtils; import android.util.Pair; import com.android.internal.util.IndentingPrintWriter; -import com.android.internal.util.TrafficStatsConstants; +import com.android.net.module.util.NetworkStackConstants; import libcore.io.IoUtils; @@ -446,7 +446,7 @@ public class NetworkDiagnostics { int sockType, int protocol, long writeTimeout, long readTimeout, int dstPort) throws ErrnoException, IOException { final int oldTag = TrafficStats.getAndSetThreadStatsTag( - TrafficStatsConstants.TAG_SYSTEM_PROBE); + NetworkStackConstants.TAG_SYSTEM_PROBE); try { mFileDescriptor = Os.socket(mAddressFamily, sockType, protocol); } finally { @@ -745,7 +745,7 @@ public class NetworkDiagnostics { if (ensureMeasurementNecessary()) return; // No need to restore the tag, since this thread is only used for this measurement. - TrafficStats.getAndSetThreadStatsTag(TrafficStatsConstants.TAG_SYSTEM_PROBE); + TrafficStats.getAndSetThreadStatsTag(NetworkStackConstants.TAG_SYSTEM_PROBE); try (SSLSocket sslSocket = setupSSLSocket()) { sendDoTProbe(sslSocket); -- cgit v1.2.3-59-g8ed1b