commit efe4ae92fca5a88e96439f48851d93823e5b2a7a
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Apr 17 05:38:05 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 17 05:38:05 2019 +0000
tree b1d5cf7206d47ecf43663bbf5d1c82f0b30177b7
parent e01a8ccfd74b3398c10123ad780ea4a6e6d2c718
parent 830600090c6eb7531840a63d4a3b9883791a907d

Merge "Fix DnsResolver API could not bypass private DNS correctly" into qt-dev

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

diff --git a/services/core/java/com/android/server/connectivity/NetworkDiagnostics.java b/services/core/java/com/android/server/connectivity/NetworkDiagnostics.java
index 948c690..a1a8e35 100644
--- a/services/core/java/com/android/server/connectivity/NetworkDiagnostics.java
+++ b/services/core/java/com/android/server/connectivity/NetworkDiagnostics.java
@@ -33,6 +33,7 @@
 import android.util.Pair;
 
 import com.android.internal.util.IndentingPrintWriter;
+import com.android.internal.util.TrafficStatsConstants;
 
 import libcore.io.IoUtils;
 
@@ -381,7 +382,8 @@
         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 {