commit 05a9835cfca2d3758e7b6847a619163acb93cd67
author Victor Chang <vichang@google.com> Mon Jul 13 12:06:12 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jul 13 12:06:12 2020 +0000
tree a7c8f84226ea515543f8a03feb4bd0ad84230610
parent 43f19d66c3f874dc97520c4231e03cbda7e80c9a
parent 686c483147eb27a1d67e1f6ed9695dc8404a80f1

Remove unused libcore.icu.ICU from LocaleStoreTest am: 686c483147

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/localepicker/+/12128094

Change-Id: Ib117da4a6c81c30ee538788fc115b145f4b24a0a

tests/src/com/android/localepicker/LocaleStoreTest.java

diff --git a/tests/src/com/android/localepicker/LocaleStoreTest.java b/tests/src/com/android/localepicker/LocaleStoreTest.java
index ae406e7..fa953ee 100644
--- a/tests/src/com/android/localepicker/LocaleStoreTest.java
+++ b/tests/src/com/android/localepicker/LocaleStoreTest.java
@@ -26,11 +26,8 @@
 
 import com.android.internal.app.LocalePicker;
 import com.android.localepicker.LocaleStore.LocaleInfo;
-import com.android.localepicker.LocaleStoreTest.ShadowICU;
 import com.android.localepicker.LocaleStoreTest.ShadowLocalePicker;
 
-import libcore.icu.ICU;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -45,7 +42,6 @@
 @Config(
         shadows = {
                 ShadowLocalePicker.class,
-                ShadowICU.class,
         })
 public class LocaleStoreTest {
 
@@ -76,14 +72,4 @@
             return new String[] { "en-US", "zh-HK", "ja-JP", "zh-TW" };
         }
     }
-
-    @Implements(ICU.class)
-    public static class ShadowICU {
-
-        @Implementation
-        public static Locale addLikelySubtags(Locale locale) {
-            ULocale uLocale = ULocale.addLikelySubtags(ULocale.forLocale(locale));
-            return uLocale.toLocale();
-        }
-    }
-}
\ No newline at end of file
+}