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

Commit 36404200 authored by Roshan Pius's avatar Roshan Pius Committed by Android (Google) Code Review
Browse files

Merge "wifi-service: Jar-Jar net util sources"

parents 71d62119 02432980

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -1189,6 +1189,7 @@ java_library { 
        "core/java/com/android/internal/util/Protocol.java",

        "core/java/com/android/internal/util/Preconditions.java",

        "telephony/java/android/telephony/Annotation.java",

	":net-utils-framework-wifi-common-srcs",

    ],

    libs: [

        "framework-annotations-lib",

wifi/jarjar-rules.txt

+3 −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.NetworkFactory* com.android.server.x.wifi.net.NetworkFactory@1

rule android.net.util.NetUtils* com.android.server.x.wifi.net.util.NetUtils@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
@@ -32,6 +34,7 @@ rule android.sysprop.** com.android.server.x.wifi.sysprop.@1 
rule android.content.pm.BaseParceledListSlice* android.x.net.wifi.util.BaseParceledListSlice@1

rule android.content.pm.ParceledListSlice* android.x.net.wifi.util.ParceledListSlice@1

rule android.net.shared.Inet4AddressUtils* android.x.net.wifi.util.Inet4AddressUtils@1

rule android.net.util.MacAddressUtils* android.x.net.wifi.util.MacAddressUtils@1

rule android.os.HandlerExecutor* android.x.net.wifi.util.HandlerExecutor@1

rule android.telephony.Annotation* android.x.net.wifi.util.TelephonyAnnotation@1

rule com.android.internal.util.AsyncChannel* android.x.net.wifi.util.AsyncChannel@1