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();
             }
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();
             }