commit d0315c056bbe3c093ac1eef137d2107b543a2a0b
author Chih-hung Hsieh <chh@google.com> Thu Oct 11 21:05:55 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 11 21:05:55 2018 +0000
tree 021e3481ee17c24178e7dd9fb372286a3d334c18
parent c755e25f615fe550e61a12ab84b2c590dd2364b1
parent 65c3c8cdd2c753ebb71d63769d1120288c7577ff

Merge "Suppress implicit-fallthrough warnings."

libs/minikin/WordBreaker.cpp

diff --git a/libs/minikin/WordBreaker.cpp b/libs/minikin/WordBreaker.cpp
index af9873c..7a9ab3a 100644
--- a/libs/minikin/WordBreaker.cpp
+++ b/libs/minikin/WordBreaker.cpp
@@ -35,18 +35,10 @@
 static UBreakIterator* createNewIterator(const Locale& locale) {
     // TODO: handle failure status
     UErrorCode status = U_ZERO_ERROR;
-    const char* localeID;
-
-    if (locale.isUnsupported()) {
-        localeID = uloc_getDefault();
-    } else {
-        localeID = locale.getString().c_str();
-    }
-
-    char buf[ULOC_FULLNAME_CAPACITY] = {};
-    uloc_getName(localeID, buf, ULOC_FULLNAME_CAPACITY, &status);
-
-    return ubrk_open(UBreakIteratorType::UBRK_LINE, buf, nullptr, 0, &status);
+    char localeID[ULOC_FULLNAME_CAPACITY] = {};
+    uloc_forLanguageTag(locale.getString().c_str(), localeID, ULOC_FULLNAME_CAPACITY, nullptr,
+                        &status);
+    return ubrk_open(UBreakIteratorType::UBRK_LINE, localeID, nullptr, 0, &status);
 }
 }  // namespace