Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40b438ab authored by Aaron Huang's avatar Aaron Huang Committed by Automerger Merge Worker
Browse files

Merge "Move some constants from TrafficStatsConstants to NetworkStackConstants" am: e4275659 

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

Change-Id: I1a21497634c2ee53abfca8dea4b8bab40cf28b3a
parents 736e5ea3 e4275659

Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -540,7 +540,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",

    ],
@@ -566,7 +565,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",

    ],

}

core/java/com/android/internal/util/TrafficStatsConstants.java

+0 −16
Original line number Diff line number Diff line
@@ -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;

}

packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java

+2 −2
Original line number Diff line number Diff line
@@ -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;
@@ -238,7 +238,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()));

services/core/java/com/android/server/connectivity/NetworkDiagnostics.java

+3 −3
Original line number Diff line number Diff line
@@ -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);