commit f0c7c6ad2b1761dd5e0523219341eaaa2932741d
author Meng Wang <mewan@google.com> Tue Nov 26 18:11:37 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 26 18:11:37 2019 +0000
tree 2a77ef89e0e6c454bf5ed23cebeb3b15790c4c61
parent eab09e59ae76e52cd7071c4d3ef6c18961a6046e
parent 103220beac0d649ee5c14a1d8940618b8a6d171a

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 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;