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

Commit b4e491a6 authored by Roshan Pius's avatar Roshan Pius
Browse files

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
parent 1763329d

packages/Tethering/jarjar-rules.txt

+1 −0
Original line number Diff line number Diff line
@@ -16,3 +16,4 @@ 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

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

+1 −2
Original line number Diff line number Diff line
@@ -21,8 +21,7 @@ import android.net.LinkProperties; 
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;

wifi/jarjar-rules.txt

+1 −0
Original line number Diff line number Diff line 
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