Merge "Move TrafficStats tags for the network stack constants" into qt-dev am: e7ef0a61f2

am: 3add1ec143

Change-Id: I4882686a86e7c6d42f4b0619b921d02619ed6d4c
This commit is contained in:
Chalard Jean
2019-04-16 17:38:30 -07:00
committed by android-build-merger

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 {