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

Commit a7864ac5 authored by Aaron Huang's avatar Aaron Huang
Browse files

Update import class from TrafficStatsConstants to NetworkStackConstants 

Some constants in TrafficStatsConstants are moved to
NetworkStackConstants so update the import class to use the constants.

Bug: 182349970
Test: FrameworksNetTests
      NetworkStackTests
      TetheringTests
Ignore-AOSP-First: this topic needs to be cherry-picked manually
to AOSP to avoid automerging differences.

Change-Id: Iaab5d721bb3b9536f560ad12436530150e03c370
parent 6db0188d

src/android/net/dhcp/DhcpClient.java

+2 −2
Original line number Diff line number Diff line
@@ -97,9 +97,9 @@ import com.android.internal.util.HexDump; 
import com.android.internal.util.MessageUtils;

import com.android.internal.util.State;

import com.android.internal.util.StateMachine;

import com.android.internal.util.TrafficStatsConstants;

import com.android.internal.util.WakeupMessage;

import com.android.net.module.util.DeviceConfigUtils;

import com.android.net.module.util.NetworkStackConstants;

import com.android.net.module.util.PacketReader;

import com.android.networkstack.R;

import com.android.networkstack.apishim.CaptivePortalDataShimImpl;
@@ -611,7 +611,7 @@ public class DhcpClient extends StateMachine { 


    private boolean initUdpSocket() {

        final int oldTag = TrafficStats.getAndSetThreadStatsTag(

                TrafficStatsConstants.TAG_SYSTEM_DHCP);

                NetworkStackConstants.TAG_SYSTEM_DHCP);

        try {

            mUdpSock = Os.socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);

            SocketUtils.bindSocketToInterface(mUdpSock, mIfaceName);

src/android/net/dhcp/DhcpServer.java

+1 −1
Original line number Diff line number Diff line
@@ -33,12 +33,12 @@ import static android.system.OsConstants.SOL_SOCKET; 
import static android.system.OsConstants.SO_BROADCAST;

import static android.system.OsConstants.SO_REUSEADDR;



import static com.android.internal.util.TrafficStatsConstants.TAG_SYSTEM_DHCP_SERVER;

import static com.android.net.module.util.Inet4AddressUtils.getBroadcastAddress;

import static com.android.net.module.util.Inet4AddressUtils.getPrefixMaskAsInet4Address;

import static com.android.net.module.util.NetworkStackConstants.INFINITE_LEASE;

import static com.android.net.module.util.NetworkStackConstants.IPV4_ADDR_ALL;

import static com.android.net.module.util.NetworkStackConstants.IPV4_ADDR_ANY;

import static com.android.net.module.util.NetworkStackConstants.TAG_SYSTEM_DHCP_SERVER;

import static com.android.server.util.PermissionUtil.enforceNetworkStackCallingPermission;



import static java.lang.Integer.toUnsignedLong;

src/com/android/networkstack/util/DnsUtils.java

+2 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import android.util.Log; 
import androidx.annotation.NonNull;

import androidx.annotation.Nullable;



import com.android.internal.util.TrafficStatsConstants;

import com.android.net.module.util.NetworkStackConstants;

import com.android.server.connectivity.NetworkMonitor.DnsLogFunc;



import java.net.InetAddress;
@@ -126,7 +126,7 @@ public class DnsUtils { 
        // look at the tag at all. Given that this is a library, the tag should be passed in by the

        // caller.

        final int oldTag = TrafficStats.getAndSetThreadStatsTag(

                TrafficStatsConstants.TAG_SYSTEM_PROBE);

                NetworkStackConstants.TAG_SYSTEM_PROBE);



        if (type == TYPE_ADDRCONFIG) {

            dnsResolver.query(network, host, flag, r -> r.run(), null /* cancellationSignal */,

src/com/android/server/connectivity/NetworkMonitor.java

+2 −2
Original line number Diff line number Diff line
@@ -161,8 +161,8 @@ import com.android.internal.annotations.GuardedBy; 
import com.android.internal.util.RingBufferIndices;

import com.android.internal.util.State;

import com.android.internal.util.StateMachine;

import com.android.internal.util.TrafficStatsConstants;

import com.android.net.module.util.DeviceConfigUtils;

import com.android.net.module.util.NetworkStackConstants;

import com.android.networkstack.NetworkStackNotifier;

import com.android.networkstack.R;

import com.android.networkstack.apishim.CaptivePortalDataShimImpl;
@@ -2463,7 +2463,7 @@ public class NetworkMonitor extends StateMachine { 
        String redirectUrl = null;

        final Stopwatch probeTimer = new Stopwatch().start();

        final int oldTag = TrafficStats.getAndSetThreadStatsTag(

                TrafficStatsConstants.TAG_SYSTEM_PROBE);

                NetworkStackConstants.TAG_SYSTEM_PROBE);

        try {

            // Follow redirects for PAC probes as such probes verify connectivity by fetching the

            // PAC proxy file, which may be configured behind a redirect.