Read the correct monetary decimal separator in DecimalFormatData
Bug: 318786838
Test: CtsLibcoreTestCases
Change-Id: I9b52dc1ea83cee624d6884bfba04a4d747e71a7e
diff --git a/luni/src/main/java/libcore/icu/DecimalFormatData.java b/luni/src/main/java/libcore/icu/DecimalFormatData.java
index 9b6061fa..dfc5bf0 100644
--- a/luni/src/main/java/libcore/icu/DecimalFormatData.java
+++ b/luni/src/main/java/libcore/icu/DecimalFormatData.java
@@ -44,7 +44,7 @@
private final char patternSeparator;
private final String percent;
private final String perMill;
- private final String monetarySeparator;
+ private final String monetaryDecimalSeparator;
private final String monetaryGroupSeparator;
private final String minusSign;
private final String exponentSeparator;
@@ -62,7 +62,7 @@
groupingSeparator = dfs.getGroupingSeparator();
percent = dfs.getPercentString();
perMill = dfs.getPerMillString();
- monetarySeparator = dfs.getDecimalSeparatorString();
+ monetaryDecimalSeparator = dfs.getMonetaryDecimalSeparatorString();
monetaryGroupSeparator = dfs.getMonetaryGroupingSeparatorString();
minusSign = dfs.getMinusSignString();
exponentSeparator = dfs.getExponentSeparator();
@@ -147,8 +147,8 @@
return perMill;
}
- public String getMonetarySeparator() {
- return monetarySeparator;
+ public String getMonetaryDecimalSeparator() {
+ return monetaryDecimalSeparator;
}
public String getMonetaryGroupSeparator() {
diff --git a/ojluni/src/main/java/java/text/DecimalFormatSymbols.java b/ojluni/src/main/java/java/text/DecimalFormatSymbols.java
index 6ae4242..ae9a994 100644
--- a/ojluni/src/main/java/java/text/DecimalFormatSymbols.java
+++ b/ojluni/src/main/java/java/text/DecimalFormatSymbols.java
@@ -48,7 +48,6 @@
import java.util.Currency;
import java.util.Locale;
import java.util.Objects;
-import sun.util.locale.provider.CalendarDataUtility;
import libcore.icu.DecimalFormatData;
import libcore.icu.ICU;
@@ -859,7 +858,7 @@
values[8] = decimalFormatData.getPerMill();
values[9] = decimalFormatData.getInfinity();
values[10] = decimalFormatData.getNaN();
- values[11] = decimalFormatData.getMonetarySeparator();
+ values[11] = decimalFormatData.getMonetaryDecimalSeparator();
values[12] = decimalFormatData.getMonetaryGroupSeparator();
String[] numberElements = values;
// END Android-changed: Removed use of DecimalFormatSymbolsProvider. Switched to ICU.
