| 7ca7ce0e68907d60709b078f9a2ea704e3adc5cb |
|
17-Nov-2017 |
Joachim Sauer <jsauer@google.com> |
Revert accidental change in test.
I accidentally reverted a change in TestFormatter to TestFormatter.java
in commit If50d927265136e8de964b54ae879291c7be85cfc.
Since the original change was unrelated to DecimalFormat, reverting it
was not supposed to happen in that commit.
The issue was not caught because CtsLibcoreOjTestCases wasn't run for
that test (only CtsLibcoreTestCases).
Bug: 69418703
Test: CtsLibcoreOjTestCases
(cherry picked from commit 044bd5e685b4bd9302ace9f77b7339cbe7e6f893)
Change-Id: I4c1935cc120966035e2891a41791fe563e308db1
Merged-In: If6a2dbb615a70739350cbae91cc33754afe2b793
|
| 044bd5e685b4bd9302ace9f77b7339cbe7e6f893 |
|
17-Nov-2017 |
Joachim Sauer <jsauer@google.com> |
Revert accidental change in test.
I accidentally reverted a change in TestFormatter to TestFormatter.java
in commit If50d927265136e8de964b54ae879291c7be85cfc.
Since the original change was unrelated to DecimalFormat, reverting it
was not supposed to happen in that commit.
The issue was not caught because CtsLibcoreOjTestCases wasn't run for
that test (only CtsLibcoreTestCases).
Bug: 69418703
Test: CtsLibcoreOjTestCases
Change-Id: If6a2dbb615a70739350cbae91cc33754afe2b793
|
| a5a851ef18cf45152fc0901a07e2f6aa303ef702 |
|
24-Oct-2017 |
Joachim Sauer <jsauer@google.com> |
Use DecimalFormat_ICU58_Android in DecimalFormat.
java.text.DecimalFormat delegates most behaviour to
android.icu.text.DecimalFormat.
ICU 59 introduced a variety of behaviour changes many of which are not
desireable to inherit for java.text.DecimalFormat.
This changes java.text.DecimalFormat to delegate to
android.icu.text.DecimalFormat_ICU58_Android instead. This class is the
ICU 58 implementation of DecimalFormat that ICU ships for testing
purposes only.
This is a stop-gap measure until we can get the new implementation
configured in a way to be close enough to the old behaviour to use in
java.text.DecimalFormat.
This commit also partially reverts the test that were changed to
accomodate the switch to ICU 59 in commit
51f8d749d3100694d695fa0cd32d2fb99c02ba74.
The reason the revert is only partial is that not all test changes were
caused by code changes. A significant portion was caused by CLDR changes
which still affect us, even if we use DecimalFormat_ICU58.
Bug: 68143370
Test: CtsLibcoreTestCases
Change-Id: If50d927265136e8de964b54ae879291c7be85cfc
|
| 51f8d749d3100694d695fa0cd32d2fb99c02ba74 |
|
29-Apr-2017 |
Fredrik Roubert <roubert@google.com> |
Updated test expectations for ICU 59.
Bug: 62410016
Test: CtsLibcoreOjTestCases
Test: CtsLibcoreTestCases
Change-Id: I49de49cd356f6e28429e4fc22d493f77b5efe4c5
|
| 6975f84c2ed72e1e26d20190b6f318718c849008 |
|
01-Mar-2017 |
Tobias Thierer <tobiast@google.com> |
Make Android patch docs in ojluni more consistent with style guide
This CL consists of an automated and a manual part (originally
reviewed as separate CLs, then squashed together before submitting
in order to minimize the number of times each Android-changed line
is touch, since that makes future git archaeology on these simpler).
Automated part: Run the following command (performs regex replacements):
find ojluni -name \*\.java | xargs sed -i \
-e 's/Android[- ]changed/Android-changed/ig' \
-e 's/Android-changed :/Android-changed:/g' \
-e 's/Android-changed \(BEGIN\|END\)/\1 Android-changed/g' \
-e 's/Android-changed - /Android-changed: /g' \
-e 's/Android[- ]removed/Android-removed/ig' \
-e 's/Android-removed :/Android-removed:/g' \
-e 's/Android-removed \(BEGIN\|END\)/\1 Android-removed/g' \
-e 's/Android-removed - /Android-removed: /g' \
-e 's/Android[- ]added/Android-added/ig' \
-e 's/Android-added :/Android-added:/g' \
-e 's/Android-added \(BEGIN\|END\)/\1 Android-added/g' \
-e 's/Android-added - /Android-added: /g' \
-e 's/----- \(BEGIN\|END\) android\( -----\)\?/\1 Android-changed/g' \
-e 's/\/\* \(BEGIN\|END\) Android-changed \*\//\/\/ \1 Android-changed/g'
Manual part: Move BEGIN Android-* lines out of block comments
Some Android-{changed,removed,added} lines occurred inside block comments.
This CL targets places in ojluni that contained the String "* BEGIN Android-"
Changes made by this CL include:
- Move the "BEGIN Android-" line into a line comment (the style guide
mandates that "Android-" lines are always in line comments). In many
cases, that line comment is immediately followed by a block comment
holding commented-out upstream code.
- Add corresponding "// END Android-" line comments, where missing.
- Drop documented import changes altogether. These create noise for
little benefit:
(1.) Most import problems will be found at compile time
(2.) They generally correspond to documented changes elsewhere in
the file.
- In most cases, the phrasing of comments and the decision whether to
keep commented out upstream code was not changed by this CL.
- Some additional tweaks were made in line with the style guide.
No attempt was made to:
- Verify that commented-out upstream code actually matches the
current upstream.
- Make any fixes (eg. to comments) that would have required
git archaeology (looking up historic commits).
Bug: 35841464
Test: make droid cts update-api
Change-Id: Ibc60979cb6061cfb0e9c7096cc9dcab30ddfa733
|
| 21c40e1463c0026f5df4faa5b17cb34ed4ec267c |
|
15-Feb-2017 |
Tobias Thierer <tobiast@google.com> |
Document Android changes/additions vs. upstream in Calendar.java
- Add missing comments for Android additions/changes
- Clarify the extent of changes with existing comments by
introducing BEGIN/END lines.
- Fix typo in Android-added @hide method name
getJapanesImperialInstance()
Consideration whether each change is correct or should be upstreamed
is not part of this CL.
Bug: 35235723
Test: make droid cts
Change-Id: I5fa9565162b62c1d4ce51875c7b83a000ef1b289
|
| 4ed824ce20b8e732696f63224d9ebea04ed3eea2 |
|
21-Dec-2016 |
Joachim Sauer <jsauer@google.com> |
Update java.util.Formatter to 8u60.
The main change is that it now supports formatting of java.time types.
- Adapt relevant test to Android sepcifics.
- Add Android-changed comments where appropriate
- Removed unused mantissa() and exponent() methods
Bug: 28832222
Test: run cts -m CtsLibcoreOjTestCases
Change-Id: I8a5de3f4bd39b6bad09850d4e5329a54331a2315
|
| c9dd3385ea6f927052783f42fb1282fb093e636e |
|
01-Sep-2016 |
Joachim Sauer <jsauer@google.com> |
Initial import of java.time.
This is a verbatim copy of the classes in java.time from the jdk8u60
branch of the OpenJDK.
They are not yet part of the build and wouldn't compile yet (no local
modifications whatsoever).
Bug: 28832222
Test: Not build, not tested.
Change-Id: I8bb148cb1095b08af895c4abffed9f22b107c218
|