From ee2afcba53dd6c8800f5ad6d1f17a760971173a0 Mon Sep 17 00:00:00 2001
From: Victor Chang <vichang@google.com>
Date: Fri, 3 Jul 2020 16:05:03 +0100
Subject: Correct the version in ShadowTimeZoneFinderS

Bug: 141747409
Test: m checkbuild
Change-Id: I8b638dc29b11112d92ffb33f10d0a82bcf6b35fc
---
 processor/sdks.txt                                                    | 1 +
 .../test/java/org/robolectric/shadows/ShadowTimeZoneFinderSTest.java  | 4 ++--
 .../src/main/java/org/robolectric/shadows/ShadowTimeZoneFinderQ.java  | 3 ++-
 .../src/main/java/org/robolectric/shadows/ShadowTimeZoneFinderS.java  | 4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/processor/sdks.txt b/processor/sdks.txt
index 4bb647c0d..b9931ca3d 100644
--- a/processor/sdks.txt
+++ b/processor/sdks.txt
@@ -11,4 +11,5 @@ prebuilts/misc/common/robolectric/android-all/android-all-8.0.0_r4-robolectric-r
 prebuilts/misc/common/robolectric/android-all/android-all-8.1.0-robolectric-4611349.jar
 prebuilts/misc/common/robolectric/android-all/android-all-9-robolectric-4913185-2.jar
 prebuilts/misc/common/robolectric/android-all/android-all-9plus-robolectric-5616371.jar
+prebuilts/misc/common/robolectric/android-all/android-all-10-robolectric-5803371.jar
 prebuilts/misc/common/robolectric/android-all/android-all-R-beta2-robolectric-6625208.jar
diff --git a/robolectric/src/test/java/org/robolectric/shadows/ShadowTimeZoneFinderSTest.java b/robolectric/src/test/java/org/robolectric/shadows/ShadowTimeZoneFinderSTest.java
index 782a15698..d4a06c3f0 100644
--- a/robolectric/src/test/java/org/robolectric/shadows/ShadowTimeZoneFinderSTest.java
+++ b/robolectric/src/test/java/org/robolectric/shadows/ShadowTimeZoneFinderSTest.java
@@ -19,7 +19,7 @@ package org.robolectric.shadows;
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static android.os.Build.VERSION_CODES.R;
+import static android.os.Build.VERSION_CODES.S;
 import static com.google.common.truth.Truth.assertThat;
 
 import android.icu.util.TimeZone;
@@ -37,7 +37,7 @@ import org.robolectric.util.ReflectionHelpers.ClassParameter;
 public class ShadowTimeZoneFinderSTest {
 
   @Test
-  @Config(minSdk = R, maxSdk = R) // both should be S, but it doesn't exist in AOSP
+  @Config(minSdk = S)
   public void lookupTimeZonesByCountry_shouldReturnExpectedTimeZones() throws Exception {
     Class<?> cls = Class.forName("com.android.i18n.timezone.TimeZoneFinder");
     Object timeZoneFinder = ReflectionHelpers.callStaticMethod(cls, "getInstance");
diff --git a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowTimeZoneFinderQ.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowTimeZoneFinderQ.java
index 324742adb..94c20c35f 100644
--- a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowTimeZoneFinderQ.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowTimeZoneFinderQ.java
@@ -2,6 +2,7 @@
 package org.robolectric.shadows;
 
 import static android.os.Build.VERSION_CODES.Q;
+import static android.os.Build.VERSION_CODES.R;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import java.io.BufferedReader;
@@ -17,7 +18,7 @@ import org.robolectric.util.ReflectionHelpers.ClassParameter;
 @Implements(
     className = "libcore.timezone.TimeZoneFinder",
     minSdk = Q,
-    maxSdk = Q, // maxSdk should be R, but it can't compile until AOSP switches current SDK to S.
+    maxSdk = R,
     isInAndroidSdk = false,
     looseSignatures = true)
 public class ShadowTimeZoneFinderQ {
diff --git a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowTimeZoneFinderS.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowTimeZoneFinderS.java
index f7f8080b2..4a6e6800e 100644
--- a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowTimeZoneFinderS.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowTimeZoneFinderS.java
@@ -17,7 +17,7 @@
 // BEGIN-INTERNAL
 package org.robolectric.shadows;
 
-import static android.os.Build.VERSION_CODES.R;
+import static android.os.Build.VERSION_CODES.S;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import java.io.BufferedReader;
@@ -31,7 +31,7 @@ import org.robolectric.annotation.Implements;
 /** Shadow for TimeZoneFinder on S or above. */
 @Implements(
     value = TimeZoneFinder.class,
-    minSdk = R, // maxSdk should be R, but it can't compile until AOSP provides S version.
+    minSdk = S,
     isInAndroidSdk = false,
     looseSignatures = true)
 public class ShadowTimeZoneFinderS {
-- 
cgit v1.2.3