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

Commit 90c420f6 authored by David Su's avatar David Su Committed by Android (Google) Code Review
Browse files

Merge changes from topic "dnssdtxtrecord-jarjar" 

* changes:
  Jarjar DnsSdTxtRecord into framework-wifi
  Build framework-telephony-stubs against core_current
parents 83d3fb18 6c82ddd6

Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -1266,7 +1266,8 @@ java_library { 
    aidl: {

        export_include_dirs: ["telephony/java"],

    },

    sdk_version: "system_current",

    sdk_version: "core_current",

    libs: ["android_system_stubs_current"],

}



java_library {

wifi/jarjar-rules.txt

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ rule android.content.pm.BaseParceledListSlice* android.x.net.wifi.util.BaseParce 
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.net.util.nsd.DnsSdTxtRecord* android.x.net.wifi.util.nsd.DnsSdTxtRecord@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