wifi-service: Remove jarjar of XmlUtils
Instead, copy XmlUtils source file into
wifi-service to remove XmlUtils usage of @hide
libcore.util.HexEncoding.
Bug: 147559755
Test: boots up and connects to wifi
Change-Id: I4ec92bf31d0ebe616658410f5101b726452fb180
diff --git a/Android.bp b/Android.bp
index 40af203..ff6ecb0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1195,7 +1195,6 @@
"core/java/com/android/internal/util/State.java",
"core/java/com/android/internal/util/StateMachine.java",
"core/java/com/android/internal/util/WakeupMessage.java",
- "core/java/com/android/internal/util/XmlUtils.java",
],
}
diff --git a/wifi/jarjar-rules.txt b/wifi/jarjar-rules.txt
index a76a455..8f72040 100644
--- a/wifi/jarjar-rules.txt
+++ b/wifi/jarjar-rules.txt
@@ -11,7 +11,6 @@
rule com.android.internal.util.State* com.android.server.x.wifi.util.State@1
rule com.android.internal.util.StateMachine* com.android.server.x.wifi.util.StateMachine@1
rule com.android.internal.util.WakeupMessage* com.android.server.x.wifi.util.WakeupMessage@1
-rule com.android.internal.util.XmlUtils* com.android.server.x.wifi.util.XmlUtils@1
rule android.util.BackupUtils* com.android.server.x.wifi.util.BackupUtils@1
rule android.util.LocalLog* com.android.server.x.wifi.util.LocalLog@1