commit c40bfee67efa8d5ecea40bd0582019028952ce23
author Joachim Sauer <jsauer@google.com> Fri Apr 01 15:11:51 2016 +0100
committer Joachim Sauer <jsauer@google.com> Tue Apr 05 15:24:05 2016 +0100
tree 683d3721a3b9f79a82d37087c3fb2c5a24fb4a3f
parent b7ed47e6b4fe56dd54bf3374ddf182ede473627f

Revert "Android patch: Ticket #11913: Fix bug in temporary workaround."

This reverts commit 65f93a4dc9f38c7ab0da01c680213f679262c986.

Bug: 27855939
(cherry pick from commit 416e28fc84b9f2d3813e2582d82825da7f536eca)

Change-Id: Ib136b873ace390fa25748aef928492516e745704

android_icu4j/src/main/java/android/icu/text/DecimalFormat.java

diff --git a/android_icu4j/src/main/java/android/icu/text/DecimalFormat.java b/android_icu4j/src/main/java/android/icu/text/DecimalFormat.java
index 9dd781f..1209e6a 100644
--- a/android_icu4j/src/main/java/android/icu/text/DecimalFormat.java
+++ b/android_icu4j/src/main/java/android/icu/text/DecimalFormat.java
@@ -1165,9 +1165,7 @@
             // acceptably be longer than 309 digits.
             int maxIntDigits;
             if (getMaximumIntegerDigits() == DOUBLE_INTEGER_DIGITS) {
-                maxIntDigits = digitList.decimalAt;
-                if (maxIntDigits >= 0)
-                    maxIntDigits++;
+                maxIntDigits = (digitList.decimalAt == 0) ? 1 : digitList.decimalAt;
             } else {
                 maxIntDigits = getMaximumIntegerDigits();
             }
@@ -1210,9 +1208,7 @@
             // acceptably be longer than 309 digits.
             int maxIntDigits;
             if (getMaximumIntegerDigits() == DOUBLE_INTEGER_DIGITS) {
-                maxIntDigits = digitList.decimalAt;
-                if (maxIntDigits >= 0)
-                    maxIntDigits++;
+                maxIntDigits = (digitList.decimalAt == 0) ? 1 : digitList.decimalAt;
             } else {
                 maxIntDigits = getMaximumIntegerDigits();
             }
@@ -1254,9 +1250,7 @@
             // acceptably be longer than 309 digits.
             int maxIntDigits;
             if (getMaximumIntegerDigits() == DOUBLE_INTEGER_DIGITS) {
-                maxIntDigits = digitList.decimalAt;
-                if (maxIntDigits >= 0)
-                    maxIntDigits++;
+                maxIntDigits = (digitList.decimalAt == 0) ? 1 : digitList.decimalAt;
             } else {
                 maxIntDigits = getMaximumIntegerDigits();
             }

icu4j/main/classes/core/src/com/ibm/icu/text/DecimalFormat.java

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/DecimalFormat.java b/icu4j/main/classes/core/src/com/ibm/icu/text/DecimalFormat.java
index 6ae2c6b..0703986 100644
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/DecimalFormat.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/DecimalFormat.java
@@ -1173,9 +1173,7 @@
             // acceptably be longer than 309 digits.
             int maxIntDigits;
             if (getMaximumIntegerDigits() == DOUBLE_INTEGER_DIGITS) {
-                maxIntDigits = digitList.decimalAt;
-                if (maxIntDigits >= 0)
-                    maxIntDigits++;
+                maxIntDigits = (digitList.decimalAt == 0) ? 1 : digitList.decimalAt;
             } else {
                 maxIntDigits = getMaximumIntegerDigits();
             }
@@ -1220,9 +1218,7 @@
             // acceptably be longer than 309 digits.
             int maxIntDigits;
             if (getMaximumIntegerDigits() == DOUBLE_INTEGER_DIGITS) {
-                maxIntDigits = digitList.decimalAt;
-                if (maxIntDigits >= 0)
-                    maxIntDigits++;
+                maxIntDigits = (digitList.decimalAt == 0) ? 1 : digitList.decimalAt;
             } else {
                 maxIntDigits = getMaximumIntegerDigits();
             }
@@ -1266,9 +1262,7 @@
             // acceptably be longer than 309 digits.
             int maxIntDigits;
             if (getMaximumIntegerDigits() == DOUBLE_INTEGER_DIGITS) {
-                maxIntDigits = digitList.decimalAt;
-                if (maxIntDigits >= 0)
-                    maxIntDigits++;
+                maxIntDigits = (digitList.decimalAt == 0) ? 1 : digitList.decimalAt;
             } else {
                 maxIntDigits = getMaximumIntegerDigits();
             }