aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/compat/EditorInfoCompatUtils.java
diff options
context:
space:
mode:
authorYohei Yukawa <yukawa@google.com>2016-02-09 19:49:13 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-02-09 19:49:13 +0000
commit436b68dd7383214d90153df5a71d630242a64478 (patch)
tree5ee40347053e4cad6543bea897a8733070130e44 /java/src/com/android/inputmethod/compat/EditorInfoCompatUtils.java
parent6740e310e900061c77d26911ef60ca13e69518e5 (diff)
parent706fce9bb0e044f281bf12742c406964b18e9190 (diff)
downloadlatinime-436b68dd7383214d90153df5a71d630242a64478.tar.gz
latinime-436b68dd7383214d90153df5a71d630242a64478.tar.xz
latinime-436b68dd7383214d90153df5a71d630242a64478.zip
Follow API removal of LocaleList#getPrimary().
am: 706fce9bb0 * commit '706fce9bb0e044f281bf12742c406964b18e9190': 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);
}
}