diff options
| author | Victor Chang <vichang@google.com> | 2020-07-03 16:05:03 +0100 |
|---|---|---|
| committer | Victor Chang <vichang@google.com> | 2020-07-10 11:44:41 +0100 |
| commit | ee2afcba53dd6c8800f5ad6d1f17a760971173a0 (patch) | |
| tree | 5fea3f75a30a676417bf682aade3fc4e029ba883 /shadows | |
| parent | b84738fc776d8934770b7d5e54aaa66171af269f (diff) | |
| download | robolectric-shadows-ee2afcba53dd6c8800f5ad6d1f17a760971173a0.tar.gz | |
Correct the version in ShadowTimeZoneFinderS
Bug: 141747409
Test: m checkbuild
Change-Id: I8b638dc29b11112d92ffb33f10d0a82bcf6b35fc
Diffstat (limited to 'shadows')
| -rw-r--r-- | shadows/framework/src/main/java/org/robolectric/shadows/ShadowTimeZoneFinderQ.java | 3 | ||||
| -rw-r--r-- | shadows/framework/src/main/java/org/robolectric/shadows/ShadowTimeZoneFinderS.java | 4 |
2 files changed, 4 insertions, 3 deletions
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 { |