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

Commit ed8c91e4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix NPE upon android.intent.action.LOCALE_CHANGED" into main

parents 5d12b205 0916f512

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

+2 −2
Original line number Diff line number Diff line
@@ -1294,8 +1294,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).isSystem()) {

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

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

            return;

        }

        final List<InputMethodInfo> suitableImes = InputMethodInfoUtils.getDefaultEnabledImes(