Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 13dbc3d4: Merge "Frameworks/base: Fix potential NPE in InputMethod"

Browse Source 
* commit '13dbc3d48d1c4ea8854f952f9ced4b7617ae5e87':
  Frameworks/base: Fix potential NPE in InputMethod
This commit is contained in:
Andreas Gampe
2015-03-18 22:33:28 +00:00
committed by Android Git Automerger
parent 4f0a96d2d9 13dbc3d48d
commit b078ff16a3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/view/inputmethod/InputMethodManager.java
View File

@@ -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) {