commit a320b944e25920289837a8822f053e84626d6710
author Meng Wang <mewan@google.com> Mon Nov 25 11:21:26 2019 -0800
committer Meng Wang <mewan@google.com> Thu Dec 12 16:55:33 2019 -0800
tree 2ff66bf711d04661ae61ef3c645b777a542f5cb5
parent 80b14eb4bc951b86780bbd5bbabc7cd66501d2c8

Do not use hidden API ArrayUtils

Use the telephony internal copy instead.

Bug: 137202333
Test: make
Merged-In: Idbedd4a24adad8c7980c2a4c0c912c8a8d0753f1
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 ab78357..288b9b0 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -56,7 +56,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;