Snap for 7550640 from c84e272e99e3bfc87ae4763ebf31cb06ad7cefa2 to mainline-wifi-releaseandroid-mainline-12.0.0_r96android-mainline-12.0.0_r83android-mainline-12.0.0_r67android-mainline-12.0.0_r57android-mainline-12.0.0_r40android-mainline-12.0.0_r20android-mainline-12.0.0_r126android-mainline-12.0.0_r114aml_wif_311811030android12-mainline-wifi-release

Change-Id: I3ebb6a5d9450df9e715827736828d198156ea1cb

3 files changed, 13 insertions, 16 deletions

diff --git a/Android.bp b/Android.bp
index 9138aa1..f1b26b7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,6 +12,10 @@
 // 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 194ab27..138dc4d 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -16,6 +16,8 @@ LOCAL_USE_AAPT2 := true
 
 LOCAL_MODULE_TAGS := optional
 
+LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
+LOCAL_LICENSE_CONDITIONS := notice
 include $(BUILD_PACKAGE)
 
 #############################################################
@@ -24,6 +26,8 @@ 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)
@@ -51,6 +55,8 @@ 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 ae406e7..39484fa 100644
--- a/tests/src/com/android/localepicker/LocaleStoreTest.java
+++ b/tests/src/com/android/localepicker/LocaleStoreTest.java
@@ -17,6 +17,7 @@
 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;
@@ -26,11 +27,8 @@ 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;
@@ -45,7 +43,6 @@ import java.util.Locale;
 @Config(
         shadows = {
                 ShadowLocalePicker.class,
-                ShadowICU.class,
         })
 public class LocaleStoreTest {
 
@@ -65,7 +62,7 @@ public class LocaleStoreTest {
     public void getLevel() {
         LocaleInfo localeInfo = LocaleStore.getLocaleInfo(Locale.forLanguageTag("zh-Hant-HK"));
         assertThat(localeInfo.getParent().toLanguageTag()).isEqualTo("zh-Hant");
-        assertThat(localeInfo.isTranslated()).named("is translated").isTrue();
+        assertWithMessage("is translated").that(localeInfo.isTranslated()).isTrue();
     }
 
     @Implements(LocalePicker.class)
@@ -76,14 +73,4 @@ 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
+}