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

Merge "Move IpUtils to frameworks/libs/net" am: 39b995b2e1

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440234

Change-Id: Ibd41a02a9a185667a7fe332213ef692c4d8bf515
This commit is contained in:
Remi NGUYEN VAN
2020-10-09 00:30:36 +00:00
committed by Automerger Merge Worker
parent 9cb49e226b 39b995b2e1
commit 7abe3e15e8
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/net/KeepalivePacketData.java
View File

@@ -22,9 +22,10 @@ import static android.net.InvalidPacketException.ERROR_INVALID_PORT;
import android.annotation.IntRange;
import android.annotation.NonNull;
import android.annotation.SystemApi;
import android.net.util.IpUtils;
import android.util.Log;
import com.android.net.module.util.IpUtils;
import java.net.InetAddress;
/**

3
core/java/android/net/NattKeepalivePacketData.java
View File

@@ -22,11 +22,12 @@ import static android.net.InvalidPacketException.ERROR_INVALID_PORT;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SystemApi;
import android.net.util.IpUtils;
import android.os.Parcel;
import android.os.Parcelable;
import android.system.OsConstants;
import com.android.net.module.util.IpUtils;
import java.net.Inet4Address;
import java.net.InetAddress;
import java.nio.ByteBuffer;

2
services/core/java/com/android/server/connectivity/KeepaliveTracker.java
View File

@@ -47,7 +47,6 @@ import android.net.NetworkAgent;
import android.net.NetworkUtils;
import android.net.SocketKeepalive.InvalidSocketException;
import android.net.TcpKeepalivePacketData;
import android.net.util.IpUtils;
import android.net.util.KeepaliveUtils;
import android.os.Binder;
import android.os.Handler;
@@ -63,6 +62,7 @@ import android.util.Pair;
import com.android.internal.R;
import com.android.internal.util.HexDump;
import com.android.internal.util.IndentingPrintWriter;
import com.android.net.module.util.IpUtils;
import java.io.FileDescriptor;
import java.net.InetAddress;