diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-31 01:30:49 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-31 01:30:49 +0000 |
| commit | 723f0e68365de7131730db70f74625e4218751c6 (patch) | |
| tree | c6da86e6cd964724341c10d8bda0f78c5d957530 | |
| parent | 20d5bd17890524fd10c52ffbf93a18e491934be6 (diff) | |
| parent | ab1cf45500c741a8f31437188df46168025a2dee (diff) | |
| download | Stk-723f0e68365de7131730db70f74625e4218751c6.tar.gz | |
Merge "Remove XmlUtils in jarjar-rules and use Telephony XmlUtils" am: c2d77020f2 am: ab1cf45500
Change-Id: I6196ebab8c927a032fb54b17a9039d252a177814
| -rw-r--r-- | Android.bp | 1 | ||||
| -rw-r--r-- | jarjar-rules.txt | 1 | ||||
| -rw-r--r-- | src/com/android/stk/StkMenuConfig.java | 2 |
3 files changed, 1 insertions, 3 deletions
@@ -5,7 +5,6 @@ android_app { libs: ["telephony-common"], static_libs: ["com.google.android.material_material"], srcs: ["**/*.java"], - jarjar_rules: "jarjar-rules.txt", platform_apis: true, certificate: "platform", aaptflags: [ 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 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 android.text.TextUtils; 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; |