From ebe5b42f71bd63973edffbda691b498611326c6f Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Mon, 17 Nov 2014 18:07:35 +0900
Subject: Make LocaleUtils.constructLocaleFromString as @Nonnull

Change-Id: I82d574c67b25239510f3ecc8882efe46e40677eb
---
 java/src/com/android/inputmethod/compat/SuggestionSpanUtils.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'java/src/com/android/inputmethod/compat/SuggestionSpanUtils.java')

diff --git a/java/src/com/android/inputmethod/compat/SuggestionSpanUtils.java b/java/src/com/android/inputmethod/compat/SuggestionSpanUtils.java
index be0744393..c38ea0037 100644
--- a/java/src/com/android/inputmethod/compat/SuggestionSpanUtils.java
+++ b/java/src/com/android/inputmethod/compat/SuggestionSpanUtils.java
@@ -118,11 +118,7 @@ public final class SuggestionSpanUtils {
             if (TextUtils.isEmpty(localeString)) {
                 continue;
             }
-            final Locale locale = LocaleUtils.constructLocaleFromString(localeString);
-            if (locale == null) {
-                continue;
-            }
-            return locale;
+            return LocaleUtils.constructLocaleFromString(localeString);
         }
         return null;
     }
-- 
cgit v1.2.3-83-g751a