commit d6754f0353269e962e731fb94fc14f7dfca9e208
author Meng Wang <mewan@google.com> Fri Dec 13 02:10:22 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 13 02:10:22 2019 +0000
tree 2ff66bf711d04661ae61ef3c645b777a542f5cb5
parent 80b14eb4bc951b86780bbd5bbabc7cd66501d2c8
parent a320b944e25920289837a8822f053e84626d6710

Merge "Do not use hidden API ArrayUtils"

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;