1 files changed, 4 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/compat/EditorInfoCompatUtils.java b/java/src/com/android/inputmethod/compat/EditorInfoCompatUtils.java
index 43714829a..56ce8f5e6 100644
--- a/java/src/com/android/inputmethod/compat/EditorInfoCompatUtils.java
+++ b/java/src/com/android/inputmethod/compat/EditorInfoCompatUtils.java
@@ -90,6 +90,9 @@ public final class EditorInfoCompatUtils {
         if (localeList == null) {
             return null;
         }
-        return LocaleListCompatUtils.getPrimary(localeList);
+        if (LocaleListCompatUtils.isEmpty(localeList)) {
+            return null;
+        }
+        return LocaleListCompatUtils.get(localeList, 0);
     }
 }