From 706fce9bb0e044f281bf12742c406964b18e9190 Mon Sep 17 00:00:00 2001 From: Yohei Yukawa Date: Tue, 9 Feb 2016 01:03:52 -0800 Subject: Follow API removal of LocaleList#getPrimary(). This follows up to a recent CL [1] that removed #getPrimary() method from LocaleList class. [1] I75f77aea6b75e38793ed8477e5e5a4420d5e6d85 fee44846376c212114223fc4259382921e6dca7a Bug: 26984092 Change-Id: Ied4678d35c4dcb380ce24e9bce9336dbbf6c16b8 --- java/src/com/android/inputmethod/compat/EditorInfoCompatUtils.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'java/src/com/android/inputmethod/compat/EditorInfoCompatUtils.java') 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); } } -- cgit v1.2.3-83-g751a