2 files changed, 14 insertions, 5 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);
     }
 }
diff --git a/java/src/com/android/inputmethod/compat/LocaleListCompatUtils.java b/java/src/com/android/inputmethod/compat/LocaleListCompatUtils.java
index 01030aedd..1c49cd4d2 100644
--- a/java/src/com/android/inputmethod/compat/LocaleListCompatUtils.java
+++ b/java/src/com/android/inputmethod/compat/LocaleListCompatUtils.java
@@ -21,14 +21,20 @@ import java.util.Locale;
 
 public final class LocaleListCompatUtils {
     private static final Class CLASS_LocaleList = CompatUtils.getClass("android.util.LocaleList");
-    private static final Method METHOD_getPrimary =
-            CompatUtils.getMethod(CLASS_LocaleList, "getPrimary");
+    private static final Method METHOD_get =
+            CompatUtils.getMethod(CLASS_LocaleList, "get", int.class);
+    private static final Method METHOD_isEmpty =
+            CompatUtils.getMethod(CLASS_LocaleList, "isEmpty");
 
     private LocaleListCompatUtils() {
         // This utility class is not publicly instantiable.
     }
 
-    public static Locale getPrimary(final Object localeList) {
-        return (Locale) CompatUtils.invoke(localeList, null, METHOD_getPrimary);
+    public static boolean isEmpty(final Object localeList) {
+        return (Boolean) CompatUtils.invoke(localeList, Boolean.FALSE, METHOD_isEmpty);
+    }
+
+    public static Locale get(final Object localeList, final int index) {
+        return (Locale) CompatUtils.invoke(localeList, null, METHOD_get, index);
     }
 }