commit b1263c4944d0b5c2b8b368ad02bdb271ecf1083b
author Shuo Qian <shuoq@google.com> Thu Jan 30 14:47:53 2020 -0800
committer Shuo Qian <shuoq@google.com> Fri Jan 31 00:26:46 2020 +0000
tree c6da86e6cd964724341c10d8bda0f78c5d957530
parent fef9e496e4ad7c703179dcbc85d8d31a7ec466bc

Remove XmlUtils in jarjar-rules and use Telephony XmlUtils

Test: Treehugger; Manual
Bug: 148543040
Change-Id: Iafb6d4372546ac3b3c657ca1bf760c82bf0182c8

Android.bp

diff --git a/Android.bp b/Android.bp
index 894aeac..f041f41 100644
--- a/Android.bp
+++ b/Android.bp
@@ -5,7 +5,6 @@
     libs: ["telephony-common"],
     static_libs: ["com.google.android.material_material"],
     srcs: ["**/*.java"],
-    jarjar_rules: "jarjar-rules.txt",
     platform_apis: true,
     certificate: "platform",
     aaptflags: [

jarjar-rules.txt

diff --git a/jarjar-rules.txt b/jarjar-rules.txt
deleted file mode 100644
index b0d73d3..0000000
--- a/jarjar-rules.txt
+++ /dev/null
@@ -1 +0,0 @@
-rule com.android.internal.util.XmlUtils* com.android.internal.telephony.XmlUtils@1

src/com/android/stk/StkMenuConfig.java

diff --git a/src/com/android/stk/StkMenuConfig.java b/src/com/android/stk/StkMenuConfig.java
index b65b3c8..c437635 100644
--- a/src/com/android/stk/StkMenuConfig.java
+++ b/src/com/android/stk/StkMenuConfig.java
@@ -28,7 +28,7 @@
 import com.android.internal.telephony.PhoneConstants;
 import com.android.internal.telephony.cat.CatLog;
 import com.android.internal.telephony.util.TelephonyUtils;
-import com.android.internal.util.XmlUtils;
+import com.android.internal.telephony.util.XmlUtils;
 
 import java.util.ArrayList;