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

Merge "Revert "Move Inet[4]AddressUtils to libs/net"" am: 55d6e27887

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

Change-Id: I472fd717d82304e4362c3075805b460b02a197e0
This commit is contained in:
Treehugger Robot
2020-07-03 00:54:07 +00:00
committed by Automerger Merge Worker
parent 53fbc9d8c0 064d18d188
commit cf29497f56
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,14 +21,13 @@ import static android.system.OsConstants.AF_INET6;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.compat.annotation.UnsupportedAppUsage; import android.compat.annotation.UnsupportedAppUsage;
import android.net.shared.Inet4AddressUtils;
import android.os.Build; import android.os.Build;
import android.system.ErrnoException; import android.system.ErrnoException;
import android.system.Os; import android.system.Os;
import android.util.Log; import android.util.Log;
import android.util.Pair; import android.util.Pair;
import com.android.net.module.util.Inet4AddressUtils;
import java.io.FileDescriptor; import java.io.FileDescriptor;
import java.math.BigInteger; import java.math.BigInteger;
import java.net.Inet4Address; import java.net.Inet4Address;

2
core/java/android/net/StaticIpConfiguration.java
View File

@@ -21,11 +21,11 @@ import android.annotation.Nullable;
import android.annotation.SystemApi; import android.annotation.SystemApi;
import android.annotation.TestApi; import android.annotation.TestApi;
import android.compat.annotation.UnsupportedAppUsage; import android.compat.annotation.UnsupportedAppUsage;
import android.net.shared.InetAddressUtils;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import com.android.internal.util.Preconditions; import com.android.internal.util.Preconditions;
import com.android.net.module.util.InetAddressUtils;
import java.net.InetAddress; import java.net.InetAddress;
import java.util.ArrayList; import java.util.ArrayList;

3
tests/net/common/java/android/net/DhcpInfoTest.java
View File

@@ -16,7 +16,8 @@
package android.net; package android.net;
import static com.android.net.module.util.Inet4AddressUtils.inet4AddressToIntHTL; import static android.net.shared.Inet4AddressUtils.inet4AddressToIntHTL;
import static com.android.testutils.MiscAssertsKt.assertFieldCountEquals; import static com.android.testutils.MiscAssertsKt.assertFieldCountEquals;
import static com.android.testutils.ParcelUtilsKt.parcelingRoundTrip; import static com.android.testutils.ParcelUtilsKt.parcelingRoundTrip;