Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b078ff16 authored by Andreas Gampe's avatar Andreas Gampe Committed by Android Git Automerger
Browse files

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

* commit '13dbc3d4':
  Frameworks/base: Fix potential NPE in InputMethod
parents 4f0a96d2 13dbc3d4

core/java/android/view/inputmethod/InputMethodManager.java

+2 −2
Original line number Diff line number Diff line
@@ -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;

                if (info != null && !info.isEmpty()) {

                    final int N = info.size();

                if (info != null && N > 0) {

                    for (int i = 0; i < N; ++i) {

                        Object o = info.get(i);

                        if (o instanceof InputMethodInfo) {