summaryrefslogtreecommitdiff
path: root/icu4j/main
AgeCommit message (Collapse)Author
2018-06-06Android patch: ticket: 13801: Doc change in BreakIteratorVictor Chang
http://bugs.icu-project.org/trac/ticket/13801 - Discourage modification on CharacterIterator after setText Bug: 80456574 Test: m docs Change-Id: I44e6c834fe06a8898e4683398fea072d66c59880
2018-05-31Android patch: Regenerated data files with Android CLDR patches.Fredrik Roubert
Binary data files updated using: external/icu/tools/updateicudata.py Change-Id: Iac447de19507d99bc9eeb83c50d63d88f97ce897
2018-05-31Android patch: CLDR data: Add data for the XA/XB pseudo locales.Fredrik Roubert
Change-Id: I4167f1442ddc68151ee02598bf051eccda1b1c04
2018-05-31Android patch: CLDR data: Force default Gregorian calendar.Fredrik Roubert
This change was introduced in Android by this patch: https://android.googlesource.com/platform/external/icu/+/b844b3e And then amended by the ICU 52 upgrade: https://android.googlesource.com/platform/external/icu/+/59d709d And then amended for ICU 55: https://android.googlesource.com/platform/external/icu/+/fafa8ad And then amended for ICU 58: https://android.googlesource.com/platform/external/icu/+/047edd2 Change-Id: I7edc9c841c82f78f77bfb9ef1862f295abdc4c62
2018-05-31Android patch: CLDR data: Replace nb with no.Fredrik Roubert
This change was introduced in Android by the ICU51.1 upgrade: https://android.googlesource.com/platform/external/icu/+/8393335 And then amended for ICU 57: https://android.googlesource.com/platform/external/icu/+/7dbcff1 These changes have been proposed, but not yet made, to CLDR: https://unicode.org/cldr/trac/ticket/2698 Change-Id: Ic8158a6a8e6e75a52ee176cf638c171d4f9827d6
2018-05-31Android patch: Skip charset tests that fail with customized data.Fredrik Roubert
Suppression of ICU4C test failures was added by the ICU 51 upgrade: https://android.googlesource.com/platform/external/icu/+/8393335 Suppression of ICU4J test failures was added for ICU 55: https://android.googlesource.com/platform/external/icu/+/3db47ed It was then partially reverted for the O release: https://android.googlesource.com/platform/external/icu/+/b48a108 (cherry picked from commit 630aab079a3a1393e8535367ec7ec86822646437) Change-Id: Ic32ec8eb822b0a99cf420addef7e413bd9b43ce7
2018-05-31Android patch: Add exceptions for big5han and gb2312han in genrb.Fredrik Roubert
This change was introduced in Android by the ICU 53 upgrade: https://android.googlesource.com/platform/external/icu/+/fceb398 Suppression of ICU4J test errors was added for ICU 55: https://android.googlesource.com/platform/external/icu/+/7b913b1 (cherry picked from commit d9fc98087b091be81a9a50fbff9c0e22855d8dac) Change-Id: I3643d41166914d33e884dd87d0b5111716ac4063
2018-05-31Android patch: Add --omitCollationRules to genrb.Fredrik Roubert
This change was introduced in Android by the ICU 54.1 upgrade: https://android.googlesource.com/platform/external/icu/+/f9878a2 Changing ICU4J test errors into warnings was introduced for ICU 55: https://android.googlesource.com/platform/external/icu/+/0543b35 Changing ICU4C test errors into log messages is new for ICU 57. Change-Id: I413291a4f8ea821ab5231fb38b00c2e8a524bf44
2018-05-31Android patch: Increase timeout for TransliteratorTest#TestSourceTargetSet2Christine Hallstrom
Test fails on watches with currently set timeout, so increase timeout. This change was introduced in Android for ICU 60: https://android.googlesource.com/platform/external/icu/+/02a8b1c https://android.googlesource.com/platform/external/icu/+/6ba7821 Change-Id: I3c685ae93c9d03289ee505e9fa6735bf487f51ec
2018-05-31Android patch: Copy DecimalFormat_ICU58 to Android specific path.Joachim Sauer
Create a copy of DecimalFormat_ICU58 for use in java.text.DecimalFormat. This also requires a copy of DigitList (as DigitList_Android). This also include applying a patch from commit b788e2aa40c1e4d4c73adc8149d9d82c19ee1190 to this copy. This change was introduced in Android for ICU 59: https://android.googlesource.com/platform/external/icu/+/ea5ab8c (cherry picked from commit 34228f961cdb39855672340d0a7e25cfea555ef7) Change-Id: Ic865fc286311a965512214109689afb178ff7402
2018-05-31Android patch: Add/expose APIs needed by java.time.Joachim Sauer
Add and expose a small number of methods that are needed by java.time. They tend to expose functionality that most end user code will not need, but allows access to ICU internal data or functionality that should be shared between ICU and java.time. - Add method to Calendar to get localized pattern string. - Add constructor to DateFormatSymbols that takes the calendar type as string. - Add method to DateFormatSymbols to get Narrow Eras This change was introduced in Android for the O release: https://android.googlesource.com/platform/external/icu/+/22b47ef (cherry picked from commit e28d850f3e60a60d996ee1ba1a2a6adf8518163d) Change-Id: I55ebc6469b3203526d06f7a3ef750f7fcfc670d2
2018-05-31Android patch: Be more tolerant about last locale name.Joachim Sauer
ULocaleTest.TestGetAvailable expected the last available locale to be zu_ZA. This is correct with the data we ship. Adding additional locales after this locale would break the test (adding locales that alphabetically sort before that locale would not be counted as an error). Verify that the last locale starts with "z" to ensure we at least don't lose locales. This change was introduced in Android for the O release: https://android.googlesource.com/platform/external/icu/+/82d33ed (cherry picked from commit 244df5a9e49eb3e0457ee00034a9dfd960057574) Change-Id: I514d5c96a737eb8432ddaada0946d813d7a87d0f
2018-05-31Android patch: Drop ICU test classes in libcore packages.Tobias Thierer
This change was introduced in Android for ICU 59: https://android.googlesource.com/platform/external/icu/+/7caa07d Change-Id: I848d3d9bcef938e86ecc1da4cbc32131bbff0c7a
2018-05-31Android patch: CLDR Ticket #10321: Apostrophe in pattern bug.Fredrik Roubert
This is a temporary workaround until the issue has been fixed upstream: https://unicode.org/cldr/trac/ticket/10321 http://bugs.icu-project.org/trac/ticket/13295 This change was introduced in Android for ICU 59: https://android.googlesource.com/platform/external/icu/+/6f91254 https://android.googlesource.com/platform/external/icu/+/a765635 https://android.googlesource.com/platform/external/icu/+/c98207c (cherry picked from commit 9b607c4e580bebd23ad9c2873227c5de7afc5279) Change-Id: I5951e257956c4be9db7eccb2d495ee129542bb5f
2018-05-31Android Patch: Ticket #13776: Fix BCP 47 locale extension in ULocale for ↵Victor Chang
first usage This is a temporary workaround until the issue has been fixed upstream: http://bugs.icu-project.org/trac/ticket/13776 This change was introduced in Android by this patch: https://android.googlesource.com/platform/external/icu/+/5a0b0d7 Change-Id: I50654a262777426c984023354797c91efaef9baf
2018-05-31Android patch: Ticket #13766: Reduce heap memory needed for ↵Victor Chang
UnicodeMapTest#TestUnicodeMapGeneralCategory This is a temporary workaround until the issue has been fixed upstream: http://bugs.icu-project.org/trac/ticket/13766 This change was introduced in Android by this patch: https://android.googlesource.com/platform/external/icu/+/046b603 Change-Id: I79d96b76d0a26266bcdb13847e41b2777d819dd9
2018-05-31Android patch: Ticket #13483: Skip Timezone.setDefault tests on AndroidFredrik Roubert
This is a temporary workaround until the issue has been fixed upstream: http://bugs.icu-project.org/trac/ticket/13483 This change was introduced in Android for ICU 60: https://android.googlesource.com/platform/external/icu/+/0d05a57 (cherry picked from commit 0d05a57a8922bb8a28c7b5cb98307fe24ee01c2f) Change-Id: I64e55b469de67153a854ea4995759c74573ddded
2018-05-31Android patch: ticket:13634 In accordance with ICU-TC meeting, changing ↵Shane Carr
percent parsing behavior to be closer to that of ICU 60. This is a temporary work-around while waiting for ICU 62 to fix this. Changes copied manually from a development branch: http://bugs.icu-project.org/trac/changeset/41222 Change-Id: I2ec9e8c0ea85684acae9f4d1156b4b68516b305e
2018-05-31Cherry-pick: ticket:13684 Making DecimalMatcher no longer consume trailing ↵Shane Carr
grouping separators, which is consistent with previous behavior. http://bugs.icu-project.org/trac/changeset/41207 Change-Id: I80cbb76a2f43f7548fd494d2ff8ab4c61ee86b6f
2018-05-31Android patch: ticket:13634 Fixing resolution of negative and percent signs ↵Shane Carr
in parsing; adding custom sign support to ScientificMatcher; and other minor fixes. This is a temporary work-around while waiting for ICU 62 to fix this. Changes copied manually from a development branch: http://bugs.icu-project.org/trac/changeset/41180 Change-Id: I961b19bb4ec2bd8f1024d4eb3d3ea24181aa1ab8
2018-05-31Cherry-pick: ticket:13517: Updated TimeZoneAdapter#equals implementation to ↵Yoshito Umaoka
return false if the given object is not a TimeZoneAdapter. http://icu-project.org/trac/changeset/41419 Bug: 29443233 Change-Id: I7692edf476dcff23cadd0dda0924cd6ae6881078
2018-05-31Cherry-pick: ticket:13617: Stop consuming AttributedCharacterIterator ↵Fredrik Roubert
instances twice. http://bugs.icu-project.org/trac/changeset/41405 Bug: 23995372 Change-Id: I1d3f1dd6d3bfbb8421345f16001d63dbf6650db9
2018-05-31Copy ICU4J 61.1 from icu-project.org to aosp/icu61.Fredrik Roubert
These files were exported from the ICU Subversion repository by running the following command: svn export \ http://source.icu-project.org/repos/icu/tags/release-61-1/icu4j icu4j Change-Id: I6bbb340ea46c6f811cf29dbd81e6f4a5907eefa1
2018-05-25Android patch: Regenerated data files with Android CLDR patches.Fredrik Roubert
Binary data files updated using: external/icu/tools/updateicudata.py Test: ant check Test: make check Change-Id: I5ed86373e6114fe17bef290bb3e5eb59856c12d4
2018-05-25Android patch: Fix pt-PT translation of "Mountain Time"Victor Chang
CLDR ticket: https://unicode.org/cldr/trac/ticket/11111 - Regression of translation introduced in Android N - According to a pt-PT linguist, "Hora de Montanha" is wrong language-wise, regardless of where you use it. Bug: 77972075 Test: CtsIcuTestCases Test: CtsLibcoreTestCases Merged-In: Icc820c306ad086f09f5f519de88d896126ff13e8 Change-Id: Icc820c306ad086f09f5f519de88d896126ff13e8 (cherry picked from commit 3cb22c8bba438a4a840d1bbbf0f223f8aed30fa5)
2018-05-25Android Patch: Fix BCP 47 locale extension in ULocale for first usageVictor Chang
Upstream ticket: http://bugs.icu-project.org/trac/ticket/13776 - For the first usage of locale extension, there is interdependency between ULocale and KeyTypeData. The example call stack would be: ULocale.forLocale -> KeyTypeData.toLegacyKey -> KeyTypeData.<clinit> -> ULocale.getDefault -> ULocale.forLocale -> KeyTypeData.toLegacyKey. - Break the inter-dependency by not using ULocale.getDefault for fallback icu4c/source/data/misc/keyTypeData.txt indicates "no fallback" in the resource bundle. ========================== keyTypeData:table(nofallback) ICUResourceBundle#instantiateBundle doesn't seem to use the value of ULocale.getDefault foe loading the resource if the resource bundle has no fallback. ======= ICUResourceBundle#instantiateBundle ======= if (openType == OpenType.DIRECT || (b != null && b.getNoFallback())) { return b; } ---- <use default locale> ---- ================================================== Before going into instantiateBundle(), if the caller didn't request disableFallback or OpenType.DIRECT, the code calls ULocale.getDefault(). If the caller did, then a null String is used for the defaultID. ================================================= public static ICUResourceBundle getBundleInstance(String baseName, String localeID, ClassLoader root, OpenType openType) { if (baseName == null) { baseName = ICUData.ICU_BASE_NAME; } localeID = ULocale.getBaseName(localeID); ICUResourceBundle b; if (openType == OpenType.LOCALE_DEFAULT_ROOT) { b = instantiateBundle(baseName, localeID, ULocale.getDefault().getBaseName(), root, openType); } else { b = instantiateBundle(baseName, localeID, null, root, openType); } if(b==null){ throw new MissingResourceException( "Could not find the bundle "+ baseName+"/"+ localeID+".res","",""); } return b; } ================================================ I verified that the bundle object's noFallback field is true for this data file. - Add a test that will fail individually when the bug occurs. I don't know how to de-initalize class KeyTypeData during the test, but we could potentially put the test into a separate test suite. Other codes in many places, e.g. JUnit, Zygote, framework, could still hide the bug by initializing KeyTypeMap and being the first victim of the bug. Bug: 70943715 Test: cts-tradefed run cts-dev -m CtsIcuTestCases -t android.icu.dev.test.util.ULocaleTest#TestForLanguageTagBug13776 pass after the CL. previously, it will fail if running individually. Test: cts-tradefed run cts-dev -m CtsIcuTestCases Test: cts-tradefed run cts-dev -m CtsLibcoreTestCases Test: ant check Change-Id: I50654a262777426c984023354797c91efaef9baf
2018-05-11Merge "Update Android to tzdata 2018e"Treehugger Robot
2018-05-09Update Android to tzdata 2018eNeil Fuller
Update ICU to tzdata 2018e. Briefly: North Korea switches back to +09 on 2018-05-05. The main format uses negative DST again, for Ireland etc. 'make tarballs' now also builds a rearguard tarball. New 's' and 'd' suffixes in SAVE columns of Rule and Zone lines. This update contains files from upstream ICU: http://bugs.icu-project.org/trac/changeset/41323 http://bugs.icu-project.org/trac/browser/trunk/icu4c/source/data/misc/metaZones.txt?rev=41323 http://bugs.icu-project.org/trac/export/41323/trunk/icu4c/source/tools/tzcode/icuzones http://bugs.icu-project.org/trac/changeset/41325 http://bugs.icu-project.org/trac/browser/trunk/icu4c/source/tools/tzcode/icuzones?rev=41325 The remaining files were generated by running system/timezone/update-tzdata.py. See the related system/timezone change too. Bug: 79222038 Test: CTS: run cts -m CtsIcuTestCases Test: CTS: run cts -m CtsLibcoreTestCases Change-Id: I65d4285a642567a938e7c933afdcdc5bf51022ea
2018-05-09Android patch: Reduce heap memory needed for ↵Victor Chang
UnicodeMapTest#TestUnicodeMapGeneralCategory - Split the full range of Unicode into 2 sets. It doesn't verify the exact same things but it's simpler change to reduce the heap usage, and match the purpose of the original change Bug: 79168307 Test: cts-tradefed run cts -m CtsIcuTestCases Change-Id: I79d96b76d0a26266bcdb13847e41b2777d819dd9
2018-04-05Update ICU data to 2018dandroid-wear-p-preview-2android-p-preview-3android-p-preview-2android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-n-iot-release-lg-thinq-wk7o-mr1-iot-preview-8Neil Fuller
This change tracks a related change in system/timezone It incorporates the latest metadata files from ICU trunk: http://bugs.icu-project.org/trac/browser/trunk/icu4c/source/data/misc/metaZones.txt?rev=41167 http://bugs.icu-project.org/trac/browser/trunk/icu4c/source/data/misc/windowsZones.txt?rev=41167 This means we pick up all changes associated with the ICU 2018d update: http://bugs.icu-project.org/trac/ticket/13666 This commit also contains changes not directly related to 2018d but which look reasonable: specifically, the change to modify the ISO code for America/Curacao from here: http://bugs.icu-project.org/trac/changeset/40980/trunk/icu4c/source/data/misc/metaZones.txt And other changes to windowsZones.txt from here: http://bugs.icu-project.org/trac/changeset/40980/trunk/icu4c/source/data/misc/windowsZones.txt Bug: 76260495 Bug: 76346996 Test: Ran ICU4C and ICU4J host tests Change-Id: I2d2d2a7030db28b9012722ea453c7d21b2046d6e
2018-03-23Android patch: Regenerated data files after CLDR cherry-pick.Fredrik Roubert
Binary data files updated using: external/icu/tools/updateicudata.py Test: ant check Test: CtsIcuTestCases Test: CtsLibcoreTestCases Change-Id: If0c102e219da12ebc18eedc61bfb124aae55e5e3
2018-03-21Android patch: Amend: Increase timeout for ↵Fredrik Roubert
TransliteratorTest#TestSourceTargetSet2 Remove Java 7 specific syntax from this local Android patch: https://android.googlesource.com/platform/external/icu/+/02a8b1c ICU4J is still built as Java 6, as specified here: https://android.googlesource.com/platform/external/icu/+/dcdfae8/icu4j/main/shared/build/common.properties#23 Using Java 7 specific syntax in ICU4J code breaks the ICU4J build, used for running the ICU4J test suite (ant check). Test: ant check Change-Id: Idb6ec602fa382367e75e078cd2fdc19866a5ea98
2018-03-07Increase timeout for TransliteratorTest#TestSourceTargetSet2 am: 02a8b1c119android-o-mr1-iot-preview-7o-mr1-iot-preview-7Christine Hallstrom
am: f650568179 Change-Id: If9c27c4602366acd2dcb5beb0ab16f3edafe5640
2018-03-07Increase timeout for TransliteratorTest#TestSourceTargetSet2Christine Hallstrom
am: 02a8b1c119 Change-Id: I670871995028087b6709053afc29ee03187daab9
2018-03-07Increase timeout for TransliteratorTest#TestSourceTargetSet2Christine Hallstrom
Test fails on watches with currently set timeout, so increase timeout. Test: Run affected CTS test Bug: 37642683 Bug: 65468170 Bug: 74173949 Change-Id: Ia81a77e5a9aece0f9f701b3ead27a8cd2f5b6712
2018-02-20Add back pacificnew processingNeil Fuller
pacificnew was removed from the list of input files unintentionally in 06e70b6a19bd19489a5b2249c41c3b6cdf2a5ec8 This change adds it back in. Bug: 73583462 Test: CTS: run cts -m CtsLibcoreTestCases Change-Id: Idf3ced65995afb4015c7415f7a0514ae26cb0475
2018-01-24ICU changes for 2018a/b/cNeil Fuller
This change contains updates from changesets: 40787 (2018a) 40794 (2018b) 40798 (2018c) The following files were regenerated using system/timezone/update-tzdata.py: icu4c/source/data/misc/zoneinfo64.txt icu4c/source/stubdata/icudt60l.dat icu4j/main/shared/data/icudata.jar icu4j/main/shared/data/icutzdata.jar See also changes in system/timezone. Test: Ran icu4c tests / icu4j tests Test: CTS: run -m CtsIcuTestCases Bug: 72057587 Change-Id: I9f531dbb536c29f7eb5311608194696f5dc835c8
2017-12-21Android patch: Regenerated data files after ICU 60.2 update.Fredrik Roubert
Binary data files updated using: external/icu/tools/updateicudata.py Change-Id: Ieb27f716a3b9f2a9b03785085b87dbdd15c9321c
2017-12-21Cherry-pick: ticket:13512 Fix problem with break iterator cloning.Andy Heninger
http://bugs.icu-project.org/trac/changeset/40743 Change-Id: I1b9f458c5e13fbac3f11c77c2690675504ed6fb8
2017-12-21Copy ICU 60.2 from icu-project.org to aosp/icu60.Fredrik Roubert
These files were exported from the ICU Subversion repository by running the following commands on top of ICU 60: svn export \ http://source.icu-project.org/repos/icu/tags/release-60-2/icu4c icu4c svn export \ http://source.icu-project.org/repos/icu/tags/release-60-2/icu4j icu4j Then rebased on top of aosp/icu60. Change-Id: Ife0aab4b843e3db56427b430aad249671139e474
2017-12-08DO NOT MERGE: Backport 2017c icu test changesandroid-vts-8.1_r3Neil Fuller
Incorporates the 2017c test changes from upstream: http://bugs.icu-project.org/trac/changeset/40634 These changes should make CTS pass with both 2017b (the stock release version) and 2017c. Bug: 68878031 Bug: 68183339 Test: build only Change-Id: Icf230d3a176d7a31dbde92b67cbb18baeedbff20 (cherry picked from commit 8b48ba7a2de62466e6a4344db948eed9e9cb73d5)
2017-12-06Cherry-pick: ticket:13505: XLocaleDistanceTest.testTiming() should be @IgnoreFredrik Roubert
http://icu-project.org/trac/changeset/40703 Change-Id: I6b7a1425072687776674ae36e9dbe4f647125cb5
2017-12-06Cherry-pick: ticket:13504: LanguageTestFmwk.setUp() should be privateFredrik Roubert
http://icu-project.org/trac/changeset/40702 Change-Id: I1c7d252b2866a30db8c95ee4182165f7b70772ae
2017-12-05Android patch: Regenerated data files after CLDR patches.Fredrik Roubert
Binary data files updated using: external/icu/tools/updateicudata.py Change-Id: I1226c6ae13c153092ba1f87ca69ef947c10ffa2a
2017-11-30Android patch: CLDR data: Add data for the XA/XB pseudo locales.Fredrik Roubert
Change-Id: Ibcf6c61a50fbea24e1be5b7be065974750740c1e
2017-11-30Android patch: CLDR data: Force default Gregorian calendar.Fredrik Roubert
This change was introduced in Android by this patch: https://android.googlesource.com/platform/external/icu/+/b844b3e And then amended by the ICU 52 upgrade: https://android.googlesource.com/platform/external/icu/+/59d709d And then amended for ICU 55: https://android.googlesource.com/platform/external/icu/+/fafa8ad And then amended for ICU 58: https://android.googlesource.com/platform/external/icu/+/047edd2 Change-Id: Icbfe73f9e70daed84c1f2b65d211b91ff379210e
2017-11-30Android patch: CLDR data: Replace nb with no.Fredrik Roubert
This change was introduced in Android by the ICU51.1 upgrade: https://android.googlesource.com/platform/external/icu/+/8393335 And then amended for ICU 57: https://android.googlesource.com/platform/external/icu/+/7dbcff1 These changes have been proposed, but not yet made, to CLDR: http://unicode.org/cldr/trac/ticket/2698 (cherry picked from commit 736f777fb8ef56e51606fdccd44c46d7edcbc714) Change-Id: Ib3168bc74d8732558cf6b3402ca4dadfa53d6b0b
2017-11-30Android patch: Skip charset tests that fail with customized data.Fredrik Roubert
Suppression of ICU4C test failures was added by the ICU 51 upgrade: https://android.googlesource.com/platform/external/icu/+/8393335 Suppression of ICU4J test failures was added for ICU 55: https://android.googlesource.com/platform/external/icu/+/3db47ed It was then partially reverted for the O release: https://android.googlesource.com/platform/external/icu/+/b48a108 (cherry picked from commit 630aab079a3a1393e8535367ec7ec86822646437) Change-Id: Iab1812da8aea5b89e180d7f0a6001a09ae1fe448
2017-11-30Android patch: Add exceptions for big5han and gb2312han in genrb.Fredrik Roubert
This change was introduced in Android by the ICU 53 upgrade: https://android.googlesource.com/platform/external/icu/+/fceb398 Suppression of ICU4J test errors was added for ICU 55: https://android.googlesource.com/platform/external/icu/+/7b913b1 (cherry picked from commit d9fc98087b091be81a9a50fbff9c0e22855d8dac) Change-Id: I855782aba28520c9e91fea547a2cfa973b81f393
2017-11-30Android patch: Add --omitCollationRules to genrb.Fredrik Roubert
This change was introduced in Android by the ICU 54.1 upgrade: https://android.googlesource.com/platform/external/icu/+/f9878a2 Changing ICU4J test errors into warnings was introduced for ICU 55: https://android.googlesource.com/platform/external/icu/+/0543b35 Changing ICU4C test errors into log messages is new for ICU 57. Change-Id: I413291a4f8ea821ab5231fb38b00c2e8a524bf44