merge from open-source master

1 files changed, 11 insertions, 7 deletions

diff --git a/i18n/digitlst.h b/i18n/digitlst.h
index 653bfe68..01b81738 100644
--- a/i18n/digitlst.h
+++ b/i18n/digitlst.h
@@ -205,6 +205,17 @@ public:
     // This code is unused.
     //UBool isLONG_MIN(void) const;
 
+    // BEGIN android-changed
+    // Public round() method for BigDecimal format.
+    // Revert this change after ICU4C supports BigDecimal.
+    /**
+     * Round the representation to the given number of digits.
+     * @param maximumDigits The maximum number of digits to be shown.
+     * Upon return, count will be less than or equal to maximumDigits.
+     */
+    void round(int32_t maximumDigits);
+    // END android-changed
+
 public:
     /**
      * These data members are intentionally public and can be set directly.
@@ -244,13 +255,6 @@ private:
     int fBufferSize;
     // END android-changed
 
-    /**
-     * Round the representation to the given number of digits.
-     * @param maximumDigits The maximum number of digits to be shown.
-     * Upon return, count will be less than or equal to maximumDigits.
-     */
-    void round(int32_t maximumDigits);
-
     UBool shouldRoundUp(int32_t maximumDigits) const;
 };