commit 85d15d8d455485b9a084594360ccf82c5e279325
author Joachim Sauer <jsauer@google.com> Thu Apr 07 11:53:55 2016 +0100
committer Joachim Sauer <jsauer@google.com> Mon Apr 25 11:09:10 2016 +0100
tree 87fddbb9e3599960848bf84075b3bd5c3eb96bef
parent 66e10c8590aa9107d09d2f16f64718e2261145a4

Up java.text.DecimalFormat max integer digits.

Android M and before used native ICU4C NumberFormat for
java.text.DecimalFormat and that had a max integer digits of 2000000000.
To maintain compatibility with earlier Android releases, use that value
for java.text.DecimalFormat.

The underlying android.icu.DecimalFormat is modified to allow maximum
integer digits bigger than 309 (but keeping the default values
unchanged).

Also add test for DecimalFormat with pattern "00" (fixed by related
revert in external/icu)

Bug: 27855939

(cherry picked from commit 43379e19f9b8cb88936d0c1be69070c7c8fbd083)

Change-Id: I873147c044b1a27d992fb2f881bd5ec074559f4d

luni/src/test/java/libcore/java/text/DecimalFormatTest.java

diff --git a/luni/src/test/java/libcore/java/text/DecimalFormatTest.java b/luni/src/test/java/libcore/java/text/DecimalFormatTest.java
index 0eae20a..2b8b566 100644
--- a/luni/src/test/java/libcore/java/text/DecimalFormatTest.java
+++ b/luni/src/test/java/libcore/java/text/DecimalFormatTest.java
@@ -283,6 +283,13 @@
         assertEquals(expected, numberFormat.format(2.01));
     }
 
+    // http://b/27855939
+    public void testBug27855939() {
+        DecimalFormat df = new DecimalFormat("00");
+        assertEquals("01", df.format(BigDecimal.ONE));
+        assertEquals("00", df.format(BigDecimal.ZERO));
+    }
+
     // Confirm the currency symbol used by a format is determined by the locale of the format
     // not the current default Locale.
     public void testSetCurrency_symbolOrigin() {

ojluni/src/main/java/java/text/DecimalFormat.java

diff --git a/ojluni/src/main/java/java/text/DecimalFormat.java b/ojluni/src/main/java/java/text/DecimalFormat.java
index b8eade3..bcc9e8b 100755
--- a/ojluni/src/main/java/java/text/DecimalFormat.java
+++ b/ojluni/src/main/java/java/text/DecimalFormat.java
@@ -465,10 +465,7 @@
     private void init(String pattern) {
         this.icuDecimalFormat =  new android.icu.text.DecimalFormat(pattern,
                 symbols.getIcuDecimalFormatSymbols());
-        maximumIntegerDigits = icuDecimalFormat.getMaximumIntegerDigits();
-        minimumIntegerDigits = icuDecimalFormat.getMinimumIntegerDigits();
-        maximumFractionDigits = icuDecimalFormat.getMaximumFractionDigits();
-        minimumFractionDigits = icuDecimalFormat.getMinimumFractionDigits();
+        updateFieldsFromIcu();
     }
 
     /**
@@ -1169,6 +1166,12 @@
     }
 
     private void updateFieldsFromIcu() {
+        // Imitate behaviour of ICU4C NumberFormat that Android used up to M.
+        // If the pattern doesn't enforce a different value (some exponential
+        // patterns do), then set the maximum integer digits to 2 billion.
+        if (icuDecimalFormat.getMaximumIntegerDigits() == DOUBLE_INTEGER_DIGITS) {
+            icuDecimalFormat.setMaximumIntegerDigits(2000000000);
+        }
         maximumIntegerDigits = icuDecimalFormat.getMaximumIntegerDigits();
         minimumIntegerDigits = icuDecimalFormat.getMinimumIntegerDigits();
         maximumFractionDigits = icuDecimalFormat.getMaximumFractionDigits();