commit 976cb8d0af958d897e4c6fdad2a05f979b18109f
author Roshan Pius <rpius@google.com> Thu Jan 16 13:05:13 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jan 16 13:05:13 2020 +0000
tree 8aeb152f740d554284dc3f1e0e5d53af529b2d93
parent 92e12f40d9ae857e2451940acdd02eb076813c6d
parent 74447aa1f510379f1204055b21ef63609c4f38e5

Merge changes from topics "user_remove_extra_user", "wifi_net_utils"

* changes:
  UserManagerService: Add UserHandle extra to user added/removed broadcast
  wifi-service: Jar-Jar net util library
  WifiManager: Add API to query STA + AP concurrency

Tethering/jarjar-rules.txt

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

Tethering/src/com/android/server/connectivity/tethering/TetheringInterfaceUtils.java

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;