commit 103220beac0d649ee5c14a1d8940618b8a6d171a
author Meng Wang <mewan@google.com> Mon Nov 25 11:21:26 2019 -0800
committer Meng Wang <mewan@google.com> Mon Nov 25 11:21:26 2019 -0800
tree f0f042bbf54c7f93683d358bf98970e8b28a5340
parent 39c82ab91164b76835eccc234127bddb2efb0517

Do not use hidden API ArrayUtils

Use the telephony internal copy instead.

Bug: 137202333
Test: make
Change-Id: Idbedd4a24adad8c7980c2a4c0c912c8a8d0753f1

src/com/android/phone/CarrierConfigLoader.java

diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index 4bf4204..9841a82 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -55,7 +55,7 @@
 import com.android.internal.telephony.PhoneFactory;
 import com.android.internal.telephony.SubscriptionInfoUpdater;
 import com.android.internal.telephony.TelephonyPermissions;
-import com.android.internal.util.ArrayUtils;
+import com.android.internal.telephony.util.ArrayUtils;
 import com.android.internal.util.FastXmlSerializer;
 import com.android.internal.util.IndentingPrintWriter;
 

src/com/android/phone/ShortcutViewUtils.java

diff --git a/src/com/android/phone/ShortcutViewUtils.java b/src/com/android/phone/ShortcutViewUtils.java
index 47ca5ee..e3c5b64 100644
--- a/src/com/android/phone/ShortcutViewUtils.java
+++ b/src/com/android/phone/ShortcutViewUtils.java
@@ -33,7 +33,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.android.internal.util.ArrayUtils;
+import com.android.internal.telephony.util.ArrayUtils;
 
 import java.util.ArrayList;
 import java.util.List;