LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Update import class of TAG_SYSTEM_NEIGHBOR" am: 5316e1ff18

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1626079

Change-Id: Idd6ae755683a38d665a7b0744bcd7d8d1d29ea6f
This commit is contained in:
Aaron Huang
2021-04-01 16:25:45 +00:00
committed by Automerger Merge Worker
parent a6d9d23180 5316e1ff18
commit 9c3cfaa9b8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Tethering/src/android/net/ip/RouterAdvertisementDaemon.java
View File

@@ -37,7 +37,7 @@ import android.system.StructTimeval;
import android.util.Log; import android.util.Log;
import com.android.internal.annotations.GuardedBy; 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.FileDescriptor;
import java.io.IOException; import java.io.IOException;
@@ -589,7 +589,7 @@ public class RouterAdvertisementDaemon {
final int send_timout_ms = 300; final int send_timout_ms = 300;
final int oldTag = TrafficStats.getAndSetThreadStatsTag( final int oldTag = TrafficStats.getAndSetThreadStatsTag(
TrafficStatsConstants.TAG_SYSTEM_NEIGHBOR); NetworkStackConstants.TAG_SYSTEM_NEIGHBOR);
try { try {
mSocket = Os.socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6); mSocket = Os.socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6);
// Setting SNDTIMEO is purely for defensive purposes. // Setting SNDTIMEO is purely for defensive purposes.