diff options
author | Neil Fuller <nfuller@google.com> | 2019-04-29 03:45:38 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-04-29 03:45:38 -0700 |
commit | c8fab3ab5074ae4a244fc1cc9a38788c85a7d121 (patch) | |
tree | 5e3af9c0936b9c0c5ea3d4d6e479b3d1ba555dee /icu4j/main/tests | |
parent | 0666edb4e5c0efea3a29126264ce5383b4546b1a (diff) | |
parent | a2c2903f404bb4175173292be39b83f5558d62b9 (diff) | |
download | icu-c8fab3ab5074ae4a244fc1cc9a38788c85a7d121.tar.gz |
Merge "Revert "Fix TimeZoneRegressionTest.TestJ5134 time period""
am: a2c2903f40
Change-Id: Ic72f0cd8a25ab6190a002eb527f1329d94953d4e
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, 0 insertions, 5 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 b03605aaf..4f18c3802 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,11 +1067,6 @@ 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); |