Snap for 8426163 from 43f19d66c3f874dc97520c4231e03cbda7e80c9a to mainline-tzdata2-releaseandroid-mainline-12.0.0_r112aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseaml_tz2_305400100

Change-Id: I5eafd7f0f803884cb55e23c7fddb48313b194ff6

3 files changed, 16 insertions, 13 deletions

diff --git a/Android.bp b/Android.bp
index f1b26b7..9138aa1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,10 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
 android_library {
     name: "localepicker",
     manifest: "AndroidManifest.xml",
diff --git a/tests/Android.mk b/tests/Android.mk
index 138dc4d..194ab27 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -16,8 +16,6 @@ LOCAL_USE_AAPT2 := true
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
 include $(BUILD_PACKAGE)
 
 #############################################################
@@ -26,8 +24,6 @@ include $(BUILD_PACKAGE)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := LocalePickerRoboTests
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
@@ -55,8 +51,6 @@ include $(BUILD_STATIC_JAVA_LIBRARY)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := RunLocalePickerRoboTests
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
 
 LOCAL_JAVA_LIBRARIES := \
     LocalePickerRoboTests \
diff --git a/tests/src/com/android/localepicker/LocaleStoreTest.java b/tests/src/com/android/localepicker/LocaleStoreTest.java
index 39484fa..ae406e7 100644
--- a/tests/src/com/android/localepicker/LocaleStoreTest.java
+++ b/tests/src/com/android/localepicker/LocaleStoreTest.java
@@ -17,7 +17,6 @@
 package com.android.localepicker;
 
 import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.robolectric.RuntimeEnvironment.application;
 import static org.robolectric.Shadows.shadowOf;
@@ -27,8 +26,11 @@ import android.telephony.TelephonyManager;
 
 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;
@@ -43,6 +45,7 @@ import java.util.Locale;
 @Config(
         shadows = {
                 ShadowLocalePicker.class,
+                ShadowICU.class,
         })
 public class LocaleStoreTest {
 
@@ -62,7 +65,7 @@ public class LocaleStoreTest {
     public void getLevel() {
         LocaleInfo localeInfo = LocaleStore.getLocaleInfo(Locale.forLanguageTag("zh-Hant-HK"));
         assertThat(localeInfo.getParent().toLanguageTag()).isEqualTo("zh-Hant");
-        assertWithMessage("is translated").that(localeInfo.isTranslated()).isTrue();
+        assertThat(localeInfo.isTranslated()).named("is translated").isTrue();
     }
 
     @Implements(LocalePicker.class)
@@ -73,4 +76,14 @@ public class LocaleStoreTest {
             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