Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move TrafficStats tags for the network stack constants"

Browse Source
This commit is contained in:
Chalard Jean
2019-04-17 05:45:56 +00:00
committed by Gerrit Code Review
parent fc53864672 896245a1e2
commit 3444dd03d6
14 changed files with 114 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Android.bp
View File

@@ -842,6 +842,7 @@ 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/android/net/shared/*.java",
]

9
api/system-current.txt
View File

@@ -3292,9 +3292,12 @@ package android.net {
method public static void setThreadStatsTagApp();
method public static void setThreadStatsTagBackup();
method public static void setThreadStatsTagRestore();
field public static final int TAG_SYSTEM_DHCP = -192; // 0xffffff40
field public static final int TAG_SYSTEM_DHCP_SERVER = -186; // 0xffffff46
field public static final int TAG_SYSTEM_PROBE = -190; // 0xffffff42
field public static final int TAG_NETWORK_STACK_IMPERSONATION_RANGE_END = -113; // 0xffffff8f
field public static final int TAG_NETWORK_STACK_IMPERSONATION_RANGE_START = -128; // 0xffffff80
field public static final int TAG_NETWORK_STACK_RANGE_END = -257; // 0xfffffeff
field public static final int TAG_NETWORK_STACK_RANGE_START = -768; // 0xfffffd00
field public static final int TAG_SYSTEM_IMPERSONATION_RANGE_END = -241; // 0xffffff0f
field public static final int TAG_SYSTEM_IMPERSONATION_RANGE_START = -256; // 0xffffff00
}
public class VpnService extends android.app.Service {

3
api/test-current.txt
View File

@@ -730,9 +730,6 @@ package android.net {
method public static long getLoopbackRxPackets();
method public static long getLoopbackTxBytes();
method public static long getLoopbackTxPackets();
field public static final int TAG_SYSTEM_DHCP = -192; // 0xffffff40
field public static final int TAG_SYSTEM_DHCP_SERVER = -186; // 0xffffff46
field public static final int TAG_SYSTEM_PROBE = -190; // 0xffffff42
}
}

5
core/java/android/net/SntpClient.java
View File

@@ -20,6 +20,8 @@ import android.annotation.UnsupportedAppUsage;
import android.os.SystemClock;
import android.util.Log;
import com.android.internal.util.TrafficStatsConstants;
import java.net.DatagramPacket;
import java.net.DatagramSocket;
import java.net.InetAddress;
@@ -99,7 +101,8 @@ public class SntpClient {
public boolean requestTime(InetAddress address, int port, int timeout, Network network) {
DatagramSocket socket = null;
final int oldTag = TrafficStats.getAndSetThreadStatsTag(TrafficStats.TAG_SYSTEM_NTP);
final int oldTag = TrafficStats.getAndSetThreadStatsTag(
TrafficStatsConstants.TAG_SYSTEM_NTP);
try {
socket = new DatagramSocket();
network.bindSocket(socket);

55
core/java/android/net/TrafficStats.java
View File

@@ -90,6 +90,42 @@ public class TrafficStats {
*/
public static final int UID_TETHERING = -5;
/**
* Tag values in this range are reserved for the network stack. The network stack is
* running as UID {@link android.os.Process.NETWORK_STACK_UID} when in the mainline
* module separate process, and as the system UID otherwise.
*/
/** @hide */
@SystemApi
public static final int TAG_NETWORK_STACK_RANGE_START = 0xFFFFFD00;
/** @hide */
@SystemApi
public static final int TAG_NETWORK_STACK_RANGE_END = 0xFFFFFEFF;
/**
* Tags between 0xFFFFFF00 and 0xFFFFFFFF are reserved and used internally by system services
* like DownloadManager when performing traffic on behalf of an application.
*/
// Please note there is no enforcement of these constants, so do not rely on them to
// determine that the caller is a system caller.
/** @hide */
@SystemApi
public static final int TAG_SYSTEM_IMPERSONATION_RANGE_START = 0xFFFFFF00;
/** @hide */
@SystemApi
public static final int TAG_SYSTEM_IMPERSONATION_RANGE_END = 0xFFFFFF0F;
/**
* Tag values between these ranges are reserved for the network stack to do traffic
* on behalf of applications. It is a subrange of the range above.
*/
/** @hide */
@SystemApi
public static final int TAG_NETWORK_STACK_IMPERSONATION_RANGE_START = 0xFFFFFF80;
/** @hide */
@SystemApi
public static final int TAG_NETWORK_STACK_IMPERSONATION_RANGE_END = 0xFFFFFF8F;
/**
* Default tag value for {@link DownloadManager} traffic.
*
@@ -128,26 +164,9 @@ public class TrafficStats {
*/
public static final int TAG_SYSTEM_APP = 0xFFFFFF05;
// TODO : remove this constant when Wifi code is updated
/** @hide */
@SystemApi
@TestApi
public static final int TAG_SYSTEM_DHCP = 0xFFFFFF40;
/** @hide */
public static final int TAG_SYSTEM_NTP = 0xFFFFFF41;
/** @hide */
@SystemApi
@TestApi
public static final int TAG_SYSTEM_PROBE = 0xFFFFFF42;
/** @hide */
public static final int TAG_SYSTEM_NEIGHBOR = 0xFFFFFF43;
/** @hide */
public static final int TAG_SYSTEM_GPS = 0xFFFFFF44;
/** @hide */
public static final int TAG_SYSTEM_PAC = 0xFFFFFF45;
/** @hide */
@SystemApi
@TestApi
public static final int TAG_SYSTEM_DHCP_SERVER = 0xFFFFFF46;
private static INetworkStatsService sStatsService;

43
core/java/com/android/internal/util/TrafficStatsConstants.java Normal file
View File

@@ -0,0 +1,43 @@
/*
* Copyright (C) 2019 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.internal.util;
/**
* Constants for traffic stats.
* @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;
}

4
packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/CaptivePortalLoginActivity.java
View File

@@ -52,6 +52,7 @@ import android.widget.TextView;
import com.android.internal.telephony.PhoneConstants;
import com.android.internal.telephony.TelephonyIntents;
import com.android.internal.util.ArrayUtils;
import com.android.internal.util.TrafficStatsConstants;
import java.io.IOException;
import java.lang.reflect.Field;
@@ -250,7 +251,8 @@ public class CaptivePortalLoginActivity extends Activity {
if (isFinishing() || isDestroyed()) return;
HttpURLConnection urlConnection = null;
int httpResponseCode = 500;
int oldTag = TrafficStats.getAndSetThreadStatsTag(TrafficStats.TAG_SYSTEM_PROBE);
int oldTag = TrafficStats.getAndSetThreadStatsTag(
TrafficStatsConstants.TAG_SYSTEM_PROBE);
try {
urlConnection = (HttpURLConnection) mNetwork.openConnection(
new URL(mCm.getCaptivePortalServerUrl()));

4
packages/NetworkStack/src/android/net/dhcp/DhcpClient.java
View File

@@ -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);

2
packages/NetworkStack/src/android/net/dhcp/DhcpServer.java
View File

@@ -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;

4
packages/NetworkStack/src/com/android/server/connectivity/NetworkMonitor.java
View File

@@ -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);

4
services/core/java/com/android/server/connectivity/NetworkDiagnostics.java
View File

@@ -33,6 +33,7 @@ import android.text.TextUtils;
import android.util.Pair;
import com.android.internal.util.IndentingPrintWriter;
import com.android.internal.util.TrafficStatsConstants;
import libcore.io.IoUtils;
@@ -381,7 +382,8 @@ public class NetworkDiagnostics {
protected void setupSocket(
int sockType, int protocol, long writeTimeout, long readTimeout, int dstPort)
throws ErrnoException, IOException {
final int oldTag = TrafficStats.getAndSetThreadStatsTag(TrafficStats.TAG_SYSTEM_PROBE);
final int oldTag = TrafficStats.getAndSetThreadStatsTag(
TrafficStatsConstants.TAG_SYSTEM_PROBE);
try {
mFileDescriptor = Os.socket(mAddressFamily, sockType, protocol);
} finally {

4
services/core/java/com/android/server/connectivity/PacManager.java
View File

@@ -39,6 +39,7 @@ import android.provider.Settings;
import android.util.Log;
import com.android.internal.annotations.GuardedBy;
import com.android.internal.util.TrafficStatsConstants;
import com.android.net.IProxyCallback;
import com.android.net.IProxyPortListener;
import com.android.net.IProxyService;
@@ -111,7 +112,8 @@ public class PacManager {
String file;
final Uri pacUrl = mPacUrl;
if (Uri.EMPTY.equals(pacUrl)) return;
final int oldTag = TrafficStats.getAndSetThreadStatsTag(TrafficStats.TAG_SYSTEM_PAC);
final int oldTag = TrafficStats.getAndSetThreadStatsTag(
TrafficStatsConstants.TAG_SYSTEM_PAC);
try {
file = get(pacUrl);
} catch (IOException ioe) {

5
services/core/java/com/android/server/location/GpsXtraDownloader.java
View File

@@ -20,6 +20,8 @@ import android.net.TrafficStats;
import android.text.TextUtils;
import android.util.Log;
import com.android.internal.util.TrafficStatsConstants;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
@@ -92,7 +94,8 @@ public class GpsXtraDownloader {
// load balance our requests among the available servers
while (result == null) {
final int oldTag = TrafficStats.getAndSetThreadStatsTag(TrafficStats.TAG_SYSTEM_GPS);
final int oldTag = TrafficStats.getAndSetThreadStatsTag(
TrafficStatsConstants.TAG_SYSTEM_GPS);
try {
result = doDownload(mXtraServers[mNextServerIndex]);
} finally {

4
services/net/java/android/net/ip/RouterAdvertisementDaemon.java
View File

@@ -36,6 +36,7 @@ import android.system.StructTimeval;
import android.util.Log;
import com.android.internal.annotations.GuardedBy;
import com.android.internal.util.TrafficStatsConstants;
import libcore.io.IoBridge;
@@ -586,7 +587,8 @@ public class RouterAdvertisementDaemon {
private boolean createSocket() {
final int SEND_TIMEOUT_MS = 300;
final int oldTag = TrafficStats.getAndSetThreadStatsTag(TrafficStats.TAG_SYSTEM_NEIGHBOR);
final int oldTag = TrafficStats.getAndSetThreadStatsTag(
TrafficStatsConstants.TAG_SYSTEM_NEIGHBOR);
try {
mSocket = Os.socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6);
// Setting SNDTIMEO is purely for defensive purposes.