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

Commit bffd3d92 authored by Cosmin Băieș's avatar Cosmin Băieș Committed by Android (Google) Code Review
Browse files

Merge "Simplify NPE fix in resetDefaultImeLocked" into main

parents 091f6353 b87428f8

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

+2 −2
Original line number Diff line number Diff line
@@ -1332,8 +1332,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(