aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Chang <vichang@google.com>2021-05-06 11:42:29 +0100
committerVictor Chang <vichang@google.com>2021-05-06 11:42:29 +0100
commite8fc73faa5fcda206ce66919432781e6319da156 (patch)
tree043aa1f5562ae2f591a5a4322b17381bed16c14a
parentb12d42349399f6a76cc79fa052c338535e26f73f (diff)
downloadlibcore-e8fc73faa5fcda206ce66919432781e6319da156.tar.gz
Use the renamed ExtendedTimeZoneNames.matchName method - part 2
Bug: 183477238 Test: treehugger Change-Id: Iee7faa3582574ee6ea3a965bcb2c83f637b93401
-rw-r--r--ojluni/src/main/java/java/text/SimpleDateFormat.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/ojluni/src/main/java/java/text/SimpleDateFormat.java b/ojluni/src/main/java/java/text/SimpleDateFormat.java
index ebc11c7b882..36a4601def7 100644
--- a/ojluni/src/main/java/java/text/SimpleDateFormat.java
+++ b/ojluni/src/main/java/java/text/SimpleDateFormat.java
@@ -2011,8 +2011,7 @@ public class SimpleDateFormat extends DateFormat {
private int subParseZoneStringFromICU(String text, int start, CalendarBuilder calb) {
String currentTimeZoneID = android.icu.util.TimeZone.getCanonicalID(getTimeZone().getID());
- Match matchedName = getExtendedTimeZoneNames().matchNameToBeRenamed(text, start,
- currentTimeZoneID);
+ Match matchedName = getExtendedTimeZoneNames().matchName(text, start, currentTimeZoneID);
if (matchedName == null) {
// No match found, return error.
return -start;