diff options
| author | Elliott Hughes <enh@google.com> | 2014-05-12 16:41:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-12 16:41:13 +0000 |
| commit | 8d8da2f68bd901a4c5de7b7b30448136162447b2 (patch) | |
| tree | 9a8b790e79648733ee7ae8331335f8074c0c3fb6 /luni/src | |
| parent | 28ae9615170bac91eb89fd3098d8c8b19bec759e (diff) | |
| parent | 6cb4582b0466e0fc1deff08c3d3a43b59b600703 (diff) | |
| download | libcore-8d8da2f68bd901a4c5de7b7b30448136162447b2.zip libcore-8d8da2f68bd901a4c5de7b7b30448136162447b2.tar.gz libcore-8d8da2f68bd901a4c5de7b7b30448136162447b2.tar.bz2 | |
am 6cb4582b: Merge "Work around an icu4c 53 bug in DecimalFormat.getGroupingSize."
* commit '6cb4582b0466e0fc1deff08c3d3a43b59b600703':
Work around an icu4c 53 bug in DecimalFormat.getGroupingSize.
Diffstat (limited to 'luni/src')
| -rw-r--r-- | luni/src/main/java/libcore/icu/NativeDecimalFormat.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/luni/src/main/java/libcore/icu/NativeDecimalFormat.java b/luni/src/main/java/libcore/icu/NativeDecimalFormat.java index 451dd91..f512002 100644 --- a/luni/src/main/java/libcore/icu/NativeDecimalFormat.java +++ b/luni/src/main/java/libcore/icu/NativeDecimalFormat.java @@ -415,6 +415,10 @@ public final class NativeDecimalFormat implements Cloneable { } public int getGroupingSize() { + // Work around http://bugs.icu-project.org/trac/ticket/10864 in icu4c 53. + if (!isGroupingUsed()) { + return 0; + } return getAttribute(this.address, UNUM_GROUPING_SIZE); } |