From 3a26d1b8ed51e8fbb1b802708aa8032683ee25e4 Mon Sep 17 00:00:00 2001
From: Xiao Ma <xiaom@google.com>
Date: Tue, 21 Dec 2021 07:35:11 +0000
Subject: [PATCH] Import InterfaceParams class from f/libs/net/common.

Ethernet service related files are going to be moved into Connectivity
mainline module. Import InterfaceParams class in EthernetNetworkFactory
from f/libs/net/common, which is visible to Connectivity module.

Bug: 210586283
Test: atest EthernetServiceTests
Change-Id: I98ebb04cc3c2b685464e7f2689424794957088b3
---
 .../src/com/android/server/ethernet/EthernetNetworkFactory.java | 2 +-
 .../com/android/server/ethernet/EthernetNetworkFactoryTest.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java b/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
index 2886cf1e3d..fc26a6c135 100644
--- a/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
+++ b/service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
@@ -37,7 +37,6 @@ import android.net.ip.IIpClient;
 import android.net.ip.IpClientCallbacks;
 import android.net.ip.IpClientUtil;
 import android.net.shared.ProvisioningConfiguration;
-import android.net.util.InterfaceParams;
 import android.os.ConditionVariable;
 import android.os.Handler;
 import android.os.Looper;
@@ -49,6 +48,7 @@ import android.util.SparseArray;
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.util.IndentingPrintWriter;
+import com.android.net.module.util.InterfaceParams;
 
 import java.io.FileDescriptor;
 import java.util.Objects;
diff --git a/tests/ethernet/java/com/android/server/ethernet/EthernetNetworkFactoryTest.java b/tests/ethernet/java/com/android/server/ethernet/EthernetNetworkFactoryTest.java
index 6422358068..4abdf030ac 100644
--- a/tests/ethernet/java/com/android/server/ethernet/EthernetNetworkFactoryTest.java
+++ b/tests/ethernet/java/com/android/server/ethernet/EthernetNetworkFactoryTest.java
@@ -44,7 +44,6 @@ import android.net.NetworkProvider;
 import android.net.NetworkRequest;
 import android.net.ip.IIpClient;
 import android.net.ip.IpClientCallbacks;
-import android.net.util.InterfaceParams;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.test.TestLooper;
@@ -53,6 +52,7 @@ import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
 import com.android.internal.R;
+import com.android.net.module.util.InterfaceParams;
 
 import org.junit.After;
 import org.junit.Before;