commit 5316e1ff189777f2c3333e809fdfe896530d6c61
author Aaron Huang <huangaaron@google.com> Thu Apr 01 15:59:39 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 01 15:59:39 2021 +0000
tree a6b1f6508104655bc6e7edbdd698f0eee5662e81
parent 9bbdac6275e66faadfa38e430f9d076bd2ebc3b7
parent e931b159dd2385cec8ed59994a824b476515843b

Merge "Update import class of TAG_SYSTEM_NEIGHBOR"

Tethering/src/android/net/ip/RouterAdvertisementDaemon.java

diff --git a/Tethering/src/android/net/ip/RouterAdvertisementDaemon.java b/Tethering/src/android/net/ip/RouterAdvertisementDaemon.java
index 7c0b7cc..afccd0a 100644
--- a/Tethering/src/android/net/ip/RouterAdvertisementDaemon.java
+++ b/Tethering/src/android/net/ip/RouterAdvertisementDaemon.java
@@ -37,7 +37,7 @@
 import android.util.Log;
 
 import com.android.internal.annotations.GuardedBy;
-import com.android.internal.util.TrafficStatsConstants;
+import com.android.net.module.util.NetworkStackConstants;
 
 import java.io.FileDescriptor;
 import java.io.IOException;
@@ -589,7 +589,7 @@
         final int send_timout_ms = 300;
 
         final int oldTag = TrafficStats.getAndSetThreadStatsTag(
-                TrafficStatsConstants.TAG_SYSTEM_NEIGHBOR);
+                NetworkStackConstants.TAG_SYSTEM_NEIGHBOR);
         try {
             mSocket = Os.socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6);
             // Setting SNDTIMEO is purely for defensive purposes.