diff options
| author | 2020-01-16 16:36:40 +0000 | |
|---|---|---|
| committer | 2020-01-16 16:45:41 +0000 | |
| commit | d26218b6d7ffb01b177642c1463ef77cd588f4ef (patch) | |
| tree | 0f6b8dba447dcdcf7ca53b39d1788c24508d46f3 | |
| parent | 6c3d66e313a27ba76e8e4860577fc9865dd0f70c (diff) | |
Revert "wifi-service: Jar-Jar net util library"
Reason for revert: b/147807058
Reverted Changes:
I902b7b742: telephony: jar-jar net.util classes on the usage s...
I90a9c537b: wifi-service: Link net util libraries
Ic3b92ca63: libs(net/common): Fixes for wifi to include.
Ib2fb2bf05: wifi-service: Jar-Jar net util library.
Bug: 147807058
Change-Id: I6a0cf666be126f45b859e38446862654e056a009
| -rw-r--r-- | packages/Tethering/jarjar-rules.txt | 1 | ||||
| -rw-r--r-- | packages/Tethering/src/com/android/server/connectivity/tethering/TetheringInterfaceUtils.java | 3 | ||||
| -rw-r--r-- | wifi/jarjar-rules.txt | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/packages/Tethering/jarjar-rules.txt b/packages/Tethering/jarjar-rules.txt index 3c182ec151ee..c6efa41e580a 100644 --- a/packages/Tethering/jarjar-rules.txt +++ b/packages/Tethering/jarjar-rules.txt @@ -16,4 +16,3 @@ rule com.android.internal.util.TrafficStatsConstants* com.android.networkstack.t 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/packages/Tethering/src/com/android/server/connectivity/tethering/TetheringInterfaceUtils.java b/packages/Tethering/src/com/android/server/connectivity/tethering/TetheringInterfaceUtils.java index 174836c14bd1..4dd68301f9fa 100644 --- a/packages/Tethering/src/com/android/server/connectivity/tethering/TetheringInterfaceUtils.java +++ b/packages/Tethering/src/com/android/server/connectivity/tethering/TetheringInterfaceUtils.java @@ -21,7 +21,8 @@ import android.net.LinkProperties; import android.net.NetworkCapabilities; import android.net.RouteInfo; import android.net.util.InterfaceSet; -import android.net.util.NetUtils; + +import com.android.net.module.util.NetUtils; import java.net.InetAddress; import java.net.UnknownHostException; diff --git a/wifi/jarjar-rules.txt b/wifi/jarjar-rules.txt index 60a38dd827fa..8f720407f4d7 100644 --- a/wifi/jarjar-rules.txt +++ b/wifi/jarjar-rules.txt @@ -1,6 +1,5 @@ rule android.net.InterfaceConfigurationParcel* @0 rule android.net.InterfaceConfiguration* com.android.server.x.wifi.net.InterfaceConfiguration@1 -rule android.net.util.** com.android.server.x.wifi.net.util.@1 # We don't jar-jar the entire package because, we still use some classes (like # AsyncChannel in com.android.internal.util) from these packages which are not |