diff options
author | Neil Fuller <nfuller@google.com> | 2019-04-15 13:32:44 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-04-15 13:32:44 -0700 |
commit | 103aab6256486fc2b59a407dbcafdf6bdbfc7e8c (patch) | |
tree | 3fc94fb28c291a20a61a667431c8de8c1e2fdb87 /icu4j/main/tests | |
parent | 94efa45084f512bba806a0c2e8209e5dd15f320b (diff) | |
parent | b4cccba85a389875080753e1a39772106f8537dc (diff) | |
download | icu-103aab6256486fc2b59a407dbcafdf6bdbfc7e8c.tar.gz |
Fix TimeZoneRegressionTest.TestJ5134 time period
am: b4cccba85a
Change-Id: I15d92eac143e08419fa2b111e72d0d6b64c9b8d9
Diffstat (limited to 'icu4j/main/tests')
-rw-r--r-- | icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneRegressionTest.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneRegressionTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneRegressionTest.java index 4f18c3802..b03605aaf 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneRegressionTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneRegressionTest.java @@ -1067,6 +1067,11 @@ public class TimeZoneRegressionTest extends TestFmwk { long endTime = testCal.getTimeInMillis(); int jdkOffset; boolean isDstJdk; + + // Android-added: Move time inside the int32 range so we can all agree. http://b/130532697 + // Integer.MIN_VALUE seconds == 1901/12/13 20:45:52 GMT + time = Integer.MIN_VALUE; + while (time < endTime) { offset = icuEastern.getOffset(time); jdkOffset = jdkEastern.getOffset(time); |