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

Commit f77d8d35 authored by Felix Stern's avatar Felix Stern Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE in InputMethodManagerService#resetDefaultImeLocked" into main

parents 152b4dd2 f26426c7

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

+1 −1
Original line number Diff line number Diff line
@@ -1310,7 +1310,7 @@ 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

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

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

            return;

        }