Snap for 11819167 from c5051aa82be2b8b1e18be6226f0a1acd3107767e to busytown-mac-infra-releasebusytown-mac-infra-release

Change-Id: Iba831b38b0b1cb8fc8e5084e66c5be1ac3e7db7d

2 files changed, 6 insertions, 5 deletions

diff --git a/src/com/android/localepicker/LocaleStore.java b/src/com/android/localepicker/LocaleStore.java
index c799bd3..30ebbe6 100644
--- a/src/com/android/localepicker/LocaleStore.java
+++ b/src/com/android/localepicker/LocaleStore.java
@@ -106,7 +106,7 @@ public class LocaleStore {
             mIsTranslated = isTranslated;
         }
 
-        /* package */ boolean isSuggested() {
+        public boolean isSuggested() {
             if (!mIsTranslated) { // Never suggest an untranslated locale
                 return false;
             }
@@ -128,7 +128,7 @@ public class LocaleStore {
             return mFullNameNative;
         }
 
-        String getFullCountryNameNative() {
+        public String getFullCountryNameNative() {
             if (mFullCountryNameNative == null) {
                 mFullCountryNameNative = LocaleHelper.getDisplayCountry(mLocale, mLocale);
             }
diff --git a/tests/Android.bp b/tests/Android.bp
index e008473..925f99c 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -18,6 +18,7 @@
 // Build test package for locale picker lib.                 //
 ///////////////////////////////////////////////////////////////
 package {
+    default_team: "trendy_team_applications_google_wide_",
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
@@ -35,10 +36,9 @@ android_app {
 
     static_libs: [
         "localepicker",
-        "robolectric_android-all-stub",
-        "Robolectric_all-target",
+        "Robolectric_all-target_upstream",
         "mockito-robolectric-prebuilt",
-        "truth-prebuilt",
+        "truth",
     ],
 }
 
@@ -49,4 +49,5 @@ android_robolectric_test {
     name: "LocalePickerRoboTests",
     srcs: ["src/**/*.java"],
     instrumentation_for: "LocalePickerTest",
+    upstream: true,
 }