From 605a54c3fb24e9d4e0ee76f52ca5bbc387a0b544 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Fri, 9 May 2014 11:27:51 -0700
Subject: Work around an icu4c 53 bug in DecimalFormat.getGroupingSize.

Found by org.apache.harmony.tests.java.text.DecimalFormatTest#test_getGroupingSize.

Bug: http://bugs.icu-project.org/trac/ticket/10864
Change-Id: I7c9ad0dd468a2d1f7bdc3252c3de696786059a2b
---
 luni/src/main/java/libcore/icu/NativeDecimalFormat.java | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'luni/src')

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);
     }
 
-- 
cgit v1.1