wifi-service: Jar-Jar net util library
Also, change tetheringInterfaceUtils to use the same jar-jar rules.
Bug: 135998869
Test: Compiles
Test: Number of compile errors when compiled against system_current
reduces.
Change-Id: Ib2fb2bf0556af3ce1519f213f7805620675d7db7
diff --git a/Tethering/jarjar-rules.txt b/Tethering/jarjar-rules.txt
index c6efa41..3c182ec 100644
--- a/Tethering/jarjar-rules.txt
+++ b/Tethering/jarjar-rules.txt
@@ -16,3 +16,4 @@
rule android.net.LocalLog* com.android.networkstack.tethering.LocalLog@1
rule android.net.shared.Inet4AddressUtils* com.android.networkstack.tethering.shared.Inet4AddressUtils@1
+rule android.net.util.** com.android.networkstack.tethering.util.@1
diff --git a/Tethering/src/com/android/server/connectivity/tethering/TetheringInterfaceUtils.java b/Tethering/src/com/android/server/connectivity/tethering/TetheringInterfaceUtils.java
index 4dd6830..174836c 100644
--- a/Tethering/src/com/android/server/connectivity/tethering/TetheringInterfaceUtils.java
+++ b/Tethering/src/com/android/server/connectivity/tethering/TetheringInterfaceUtils.java
@@ -21,8 +21,7 @@
import android.net.NetworkCapabilities;
import android.net.RouteInfo;
import android.net.util.InterfaceSet;
-
-import com.android.net.module.util.NetUtils;
+import android.net.util.NetUtils;
import java.net.InetAddress;
import java.net.UnknownHostException;