commit 90c420f6e4c7a557519143bbcf68f216faeb39ae
author David Su <dysu@google.com> Fri Jan 17 18:18:05 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 17 18:18:05 2020 +0000
tree e74268e8c753cbf425b42b3f5d335bd9defc9196
parent 83d3fb1805cd464dda76726fa62664f61b3c6b8f
parent 6c82ddd6881ae5a2bf7348a6dd2a80661a6e9c62

Merge changes from topic "dnssdtxtrecord-jarjar"

* changes:
  Jarjar DnsSdTxtRecord into framework-wifi
  Build framework-telephony-stubs against core_current

Android.bp

diff --git a/Android.bp b/Android.bp
index 0e3d374..1ddfbe5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1266,7 +1266,8 @@
     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

diff --git a/wifi/jarjar-rules.txt b/wifi/jarjar-rules.txt
index d377ee6..950361c 100644
--- a/wifi/jarjar-rules.txt
+++ b/wifi/jarjar-rules.txt
@@ -35,6 +35,7 @@
 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