diff options
| author | Elliott Hughes <enh@google.com> | 2014-07-30 17:55:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-30 16:17:48 +0000 |
| commit | d343e35535a99bad32eea0defc8a3e9c23c9967f (patch) | |
| tree | 0f0fd5984239e9f590316cfbc90bd9c3aed7ee36 /luni | |
| parent | 1ff5465107e518d45cadeebbe70d23e2a8f8c56e (diff) | |
| parent | 77a1f19296d34e6ab74f044f56fa8a0aaa0e6619 (diff) | |
| download | libcore-d343e35535a99bad32eea0defc8a3e9c23c9967f.zip libcore-d343e35535a99bad32eea0defc8a3e9c23c9967f.tar.gz libcore-d343e35535a99bad32eea0defc8a3e9c23c9967f.tar.bz2 | |
Merge "Remove an obsolete Pacific/Apia hack."
Diffstat (limited to 'luni')
| -rw-r--r-- | luni/src/main/native/libcore_icu_TimeZoneNames.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/luni/src/main/native/libcore_icu_TimeZoneNames.cpp b/luni/src/main/native/libcore_icu_TimeZoneNames.cpp index faf87f1..a7c9098 100644 --- a/luni/src/main/native/libcore_icu_TimeZoneNames.cpp +++ b/luni/src/main/native/libcore_icu_TimeZoneNames.cpp @@ -75,7 +75,6 @@ static void TimeZoneNames_fillZoneStrings(JNIEnv* env, jclass, jstring javaLocal const UDate now(Calendar::getNow()); static const UnicodeString kUtc("UTC", 3, US_INV); - static const UnicodeString pacific_apia("Pacific/Apia", 12, US_INV); size_t id_count = env->GetArrayLength(result); for (size_t i = 0; i < id_count; ++i) { @@ -104,11 +103,6 @@ static void TimeZoneNames_fillZoneStrings(JNIEnv* env, jclass, jstring javaLocal // every language). // TODO: check CLDR doesn't actually have this somewhere. long_std = short_std = long_dst = short_dst = kUtc; - } else if (zone_id.unicodeString() == pacific_apia) { - // icu4c 50 doesn't know Samoa has DST yet. http://b/7955614 - if (long_dst.isBogus()) { - long_dst = "Samoa Daylight Time"; - } } bool okay = |