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

Commit b87428f8 authored by Cosmin Băieș's avatar Cosmin Băieș
Browse files

Simplify NPE fix in resetDefaultImeLocked 

Flag: EXEMPT cleanup
Bug: 379402980
Test: n/a
Change-Id: I734b5d1151b76ed441c2832cf378164ab5925856
parent 89ae7f71

services/core/java/com/android/server/inputmethod/InputMethodManagerService.java

+2 −2
Original line number Diff line number Diff line
@@ -1319,8 +1319,8 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl. 
        // Do not reset the default (current) IME when it is a 3rd-party IME

        String selectedMethodId = bindingController.getSelectedMethodId();

        final InputMethodSettings settings = InputMethodSettingsRepository.get(userId);

        if (selectedMethodId != null && settings.getMethodMap().get(selectedMethodId) != null

                && !settings.getMethodMap().get(selectedMethodId).isSystem()) {

        final InputMethodInfo selectedImi = settings.getMethodMap().get(selectedMethodId);

        if (selectedImi != null && !selectedImi.isSystem()) {

            return;

        }

        final List<InputMethodInfo> suitableImes = InputMethodInfoUtils.getDefaultEnabledImes(