| commit | 985a17dfae24e9a7180b22b8dcab8ff470469bfb | [log] [tgz] |
|---|---|---|
| author | Aaron Huang <huangaaron@google.com> | Thu Apr 01 16:45:13 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 01 16:45:13 2021 +0000 |
| tree | 97b196e47b68ad9494757c9cdcd145b957877744 | |
| parent | 4a5ef290d1703139a1343778aae65f8fa62e861f [diff] | |
| parent | 9c3cfaa9b8d7809e8b403a61fd35f7a79784b5ce [diff] |
Merge "Update import class of TAG_SYSTEM_NEIGHBOR" am: 5316e1ff18 am: 9c3cfaa9b8 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1626079 Change-Id: I11f5bf7f264d48d6ad0dab63aace39fc85251cf0
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.