aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/compat/EditorInfoCompatUtils.java
diff options
context:
space:
mode:
authorYohei Yukawa <yukawa@google.com>2016-02-09 22:53:41 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-02-09 22:53:41 +0000
commit440b9983e5fe11cf3e1e0f12ea749c8ad32efa28 (patch)
treec3db66538bcd93112405586b539f2bfb00cd8af1 /java/src/com/android/inputmethod/compat/EditorInfoCompatUtils.java
parent49a4881a7c112fac20f51ad38e1a12fd6797929c (diff)
parent436b68dd7383214d90153df5a71d630242a64478 (diff)
downloadlatinime-440b9983e5fe11cf3e1e0f12ea749c8ad32efa28.tar.gz
latinime-440b9983e5fe11cf3e1e0f12ea749c8ad32efa28.tar.xz
latinime-440b9983e5fe11cf3e1e0f12ea749c8ad32efa28.zip
Follow API removal of LocaleList#getPrimary(). am: 706fce9bb0
am: 436b68dd73 * commit '436b68dd7383214d90153df5a71d630242a64478': Follow API removal of LocaleList#getPrimary().
Diffstat (limited to 'java/src/com/android/inputmethod/compat/EditorInfoCompatUtils.java')
-rw-r--r--java/src/com/android/inputmethod/compat/EditorInfoCompatUtils.java5
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);
}
}