Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b16c712f authored by Chalard Jean's avatar Chalard Jean
Browse files

Move module utils to the module package. 

Test: builds
Change-Id: If5d1e4a58fb2d6d9544e6d01995dabe445cf1f25
(cherry picked from commit 046bf639eb7728504be35e30e3dd49af3d029728)
parent b2a4dfe4

core/java/android/net/LinkProperties.java

+3 −2
Original line number Diff line number Diff line
@@ -21,13 +21,14 @@ import android.annotation.Nullable; 
import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.compat.annotation.UnsupportedAppUsage;

import android.net.util.LinkPropertiesUtils;

import android.net.util.LinkPropertiesUtils.CompareResult;

import android.os.Build;

import android.os.Parcel;

import android.os.Parcelable;

import android.text.TextUtils;



import com.android.net.module.util.LinkPropertiesUtils;

import com.android.net.module.util.LinkPropertiesUtils.CompareResult;



import java.net.Inet4Address;

import java.net.Inet6Address;

import java.net.InetAddress;

core/java/android/net/MacAddress.java

+1 −1
Original line number Diff line number Diff line
@@ -20,12 +20,12 @@ import android.annotation.IntDef; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.compat.annotation.UnsupportedAppUsage;

import android.net.util.MacAddressUtils;

import android.net.wifi.WifiInfo;

import android.os.Parcel;

import android.os.Parcelable;



import com.android.internal.util.Preconditions;

import com.android.net.module.util.MacAddressUtils;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

core/java/android/net/RouteInfo.java

+2 −1
Original line number Diff line number Diff line
@@ -22,11 +22,12 @@ import android.annotation.Nullable; 
import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.compat.annotation.UnsupportedAppUsage;

import android.net.util.NetUtils;

import android.os.Build;

import android.os.Parcel;

import android.os.Parcelable;



import com.android.net.module.util.NetUtils;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.net.Inet4Address;

packages/Tethering/src/android/net/ip/NeighborPacketForwarder.java

+2 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import static android.system.OsConstants.SOCK_NONBLOCK; 
import static android.system.OsConstants.SOCK_RAW;



import android.net.util.InterfaceParams;

import android.net.util.PacketReader;

import android.net.util.SocketUtils;

import android.net.util.TetheringUtils;

import android.os.Handler;
@@ -33,6 +32,8 @@ import android.system.ErrnoException; 
import android.system.Os;

import android.util.Log;



import com.android.net.module.util.PacketReader;



import java.io.FileDescriptor;

import java.io.IOException;

import java.net.Inet6Address;

services/core/java/com/android/server/ConnectivityService.java

+2 −2
Original line number Diff line number Diff line
@@ -136,8 +136,6 @@ import android.net.metrics.IpConnectivityLog; 
import android.net.metrics.NetworkEvent;

import android.net.netlink.InetDiagMessage;

import android.net.shared.PrivateDnsConfig;

import android.net.util.LinkPropertiesUtils.CompareOrUpdateResult;

import android.net.util.LinkPropertiesUtils.CompareResult;

import android.net.util.MultinetworkPolicyTracker;

import android.net.util.NetdService;

import android.os.Binder;
@@ -195,6 +193,8 @@ import com.android.internal.util.IndentingPrintWriter; 
import com.android.internal.util.LocationPermissionChecker;

import com.android.internal.util.MessageUtils;

import com.android.internal.util.XmlUtils;

import com.android.net.module.util.LinkPropertiesUtils.CompareOrUpdateResult;

import com.android.net.module.util.LinkPropertiesUtils.CompareResult;

import com.android.server.am.BatteryStatsService;

import com.android.server.connectivity.AutodestructReference;

import com.android.server.connectivity.DataConnectionStats;