diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-31 01:42:49 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-31 01:42:49 +0000 |
| commit | ff181b6796eaeeeb3d3cca3a80b8d92f612a3c0f (patch) | |
| tree | 12b58a0134d7363722966e428211cdae89eaf933 | |
| parent | c63753c50f3bbdc156c80851a68b57610fa09028 (diff) | |
| parent | 723f0e68365de7131730db70f74625e4218751c6 (diff) | |
| download | Stk-ff181b6796eaeeeb3d3cca3a80b8d92f612a3c0f.tar.gz | |
Merge "Remove XmlUtils in jarjar-rules and use Telephony XmlUtils" am: c2d77020f2 am: ab1cf45500 am: 723f0e6836
Change-Id: Ib8ff4e9522a49e2094f5563ab5696b90bf00b043
| -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; |