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

Commit ac5b899a authored by Chalard Jean's avatar Chalard Jean
Browse files

Move TrafficStats tags for the network stack constants 

As per API council feedback, these constants should live in
a place that is private to the network stack, only with a
range defined in system API.

Bug: 129433383
Test: m
Change-Id: I84a90f84a9af6fef4667ee4d512ebd0413222086
Merged-In: I4882686a86e7c6d42f4b0619b921d02619ed6d4c
Merged-In: I9b648ed6c687d56db61a54570c7880c51c1bae51
parent f51f15e2

src/android/net/dhcp/DhcpClient.java

+3 −1
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ 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.networkstack.R;
@@ -331,7 +332,8 @@ public class DhcpClient extends StateMachine { 
    }



    private boolean initUdpSocket() {

        final int oldTag = TrafficStats.getAndSetThreadStatsTag(TrafficStats.TAG_SYSTEM_DHCP);

        final int oldTag = TrafficStats.getAndSetThreadStatsTag(

                TrafficStatsConstants.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
@@ -16,7 +16,6 @@ 


package android.net.dhcp;



import static android.net.TrafficStats.TAG_SYSTEM_DHCP_SERVER;

import static android.net.dhcp.DhcpPacket.DHCP_CLIENT;

import static android.net.dhcp.DhcpPacket.DHCP_HOST_NAME;

import static android.net.dhcp.DhcpPacket.DHCP_SERVER;
@@ -33,6 +32,7 @@ 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.server.util.NetworkStackConstants.INFINITE_LEASE;

import static com.android.server.util.NetworkStackConstants.IPV4_ADDR_ALL;

import static com.android.server.util.NetworkStackConstants.IPV4_ADDR_ANY;

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

+3 −1
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ import com.android.internal.annotations.VisibleForTesting; 
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.networkstack.R;



import java.io.IOException;
@@ -1478,7 +1479,8 @@ public class NetworkMonitor extends StateMachine { 
        int httpResponseCode = CaptivePortalProbeResult.FAILED_CODE;

        String redirectUrl = null;

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

        final int oldTag = TrafficStats.getAndSetThreadStatsTag(TrafficStats.TAG_SYSTEM_PROBE);

        final int oldTag = TrafficStats.getAndSetThreadStatsTag(

                TrafficStatsConstants.TAG_SYSTEM_PROBE);

        try {

            urlConnection = (HttpURLConnection) mNetwork.openConnection(url);

            urlConnection.setInstanceFollowRedirects(probeType == ValidationProbeEvent.PROBE_PAC);