diff options
| author | Andreas Gampe <agampe@google.com> | 2015-03-18 22:19:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-18 22:19:58 +0000 |
| commit | 13dbc3d48d1c4ea8854f952f9ced4b7617ae5e87 (patch) | |
| tree | d5b5cfd334d2e71a50130f13f0269069bf1105b6 /core/java/android | |
| parent | 9cc36ac2a2e07f81a9b11da7ff08e0da58b0143e (diff) | |
| parent | 4236ad7a2fe4a410571c4bad314b6168b1a4e836 (diff) | |
Merge "Frameworks/base: Fix potential NPE in InputMethod"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/view/inputmethod/InputMethodManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java index 325ffdd1654f..1416e1bacf82 100644 --- a/core/java/android/view/inputmethod/InputMethodManager.java +++ b/core/java/android/view/inputmethod/InputMethodManager.java @@ -1993,8 +1993,8 @@ public final class InputMethodManager { List<Object> info = mService.getShortcutInputMethodsAndSubtypes(); // "info" has imi1, subtype1, subtype2, imi2, subtype2, imi3, subtype3..in the list ArrayList<InputMethodSubtype> subtypes = null; - final int N = info.size(); - if (info != null && N > 0) { + if (info != null && !info.isEmpty()) { + final int N = info.size(); for (int i = 0; i < N; ++i) { Object o = info.get(i); if (o instanceof InputMethodInfo) { |