diff options
| author | Victor Chang <vichang@google.com> | 2019-05-03 03:22:24 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-03 03:22:24 -0700 |
| commit | 97f9afa5366824b9e3b16cefbfb7b9f9c301c9ec (patch) | |
| tree | 2c1f708651a1ec335f728c2e1ae0d3a68c94994f /android_icu4j/src/main/tests | |
| parent | c8fab3ab5074ae4a244fc1cc9a38788c85a7d121 (diff) | |
| parent | 35bf71735aebc25a250a9124221dbae91b30d83d (diff) | |
| download | icu-97f9afa5366824b9e3b16cefbfb7b9f9c301c9ec.tar.gz | |
JapaneseCalendar.CURRENT_ERA should not depend on system time
am: 35bf71735a
Change-Id: Id11e9c39fc2520dc7fd3cd681c4936b3ba0be78d
Diffstat (limited to 'android_icu4j/src/main/tests')
| -rw-r--r-- | android_icu4j/src/main/tests/android/icu/dev/test/calendar/EraRulesTest.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/android_icu4j/src/main/tests/android/icu/dev/test/calendar/EraRulesTest.java b/android_icu4j/src/main/tests/android/icu/dev/test/calendar/EraRulesTest.java index c9d1a7347..74e01e93c 100644 --- a/android_icu4j/src/main/tests/android/icu/dev/test/calendar/EraRulesTest.java +++ b/android_icu4j/src/main/tests/android/icu/dev/test/calendar/EraRulesTest.java @@ -13,6 +13,7 @@ import android.icu.impl.EraRules; import android.icu.util.Calendar; import android.icu.util.JapaneseCalendar; import android.icu.util.ULocale; +import android.icu.util.TimeZone; import android.icu.testsharding.MainTestShard; /** @@ -47,7 +48,8 @@ public class EraRulesTest extends TestFmwk { + calId); } - Calendar cal = Calendar.getInstance(new ULocale("en")); + // Android-changed: EraRules.getCurrentEraIndex() uses UTC time. http://b/131766004 + Calendar cal = Calendar.getInstance(TimeZone.GMT_ZONE, new ULocale("en")); int currentIdx = rules1.getCurrentEraIndex(); int currentYear = cal.get(Calendar.YEAR); int idx = rules1.getEraIndex(currentYear, cal.get(Calendar.MONTH) + 1, cal.get(Calendar.DATE)); |