diff options
| author | Andreas Gampe <agampe@google.com> | 2015-03-18 23:50:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-18 23:50:54 +0000 |
| commit | 27f2fe5c1a0339207fc031ea8a1a6ee13d37bc65 (patch) | |
| tree | da0f5046a626aceb4deeb7091d5fb79efa4d0b33 /core/java/android/view/inputmethod | |
| parent | e09a94158586abdda98d6770fc62c2653a29a41c (diff) | |
| parent | b078ff16a3ea83f7e4f444eb7b7b699ee8e913a6 (diff) | |
| download | frameworks_base-27f2fe5c1a0339207fc031ea8a1a6ee13d37bc65.zip frameworks_base-27f2fe5c1a0339207fc031ea8a1a6ee13d37bc65.tar.gz frameworks_base-27f2fe5c1a0339207fc031ea8a1a6ee13d37bc65.tar.bz2 | |
am b078ff16: am 13dbc3d4: Merge "Frameworks/base: Fix potential NPE in InputMethod"
* commit 'b078ff16a3ea83f7e4f444eb7b7b699ee8e913a6':
Frameworks/base: Fix potential NPE in InputMethod
Diffstat (limited to 'core/java/android/view/inputmethod')
| -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 0996810..78604bf 100644 --- a/core/java/android/view/inputmethod/InputMethodManager.java +++ b/core/java/android/view/inputmethod/InputMethodManager.java @@ -1992,8 +1992,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) { |