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

Commit 53273965 authored by Chalard Jean's avatar Chalard Jean Committed by Android (Google) Code Review
Browse files

Merge "Move module utils to the module package." into mainline-prod

parents 042b06f0 6e6390a6

core/java/android/net/LinkProperties.java

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

import android.annotation.SystemApi;

import android.compat.annotation.UnsupportedAppUsage;

import android.net.util.LinkPropertiesUtils;

import android.os.Build;

import android.os.Parcel;

import android.os.Parcelable;

import android.text.TextUtils;



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



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
@@ -21,11 +21,12 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.annotation.SystemApi;

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;

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

+2 −2
Original line number Diff line number Diff line
@@ -135,8 +135,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;
@@ -194,6 +192,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;

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

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import android.net.Uri; 
import android.net.nsd.INsdManager;

import android.net.nsd.NsdManager;

import android.net.nsd.NsdServiceInfo;

import android.net.util.nsd.DnsSdTxtRecord;

import android.os.Handler;

import android.os.HandlerThread;

import android.os.Message;
@@ -42,6 +41,7 @@ import com.android.internal.util.AsyncChannel; 
import com.android.internal.util.DumpUtils;

import com.android.internal.util.State;

import com.android.internal.util.StateMachine;

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



import java.io.FileDescriptor;

import java.io.PrintWriter;