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

Commit d2ea8aed authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Flag cleanup consistent_get_current_input_method_info" into main

parents 897d275e 72cd7440

core/java/android/view/inputmethod/flags.aconfig

+0 −11
Original line number Original line Diff line number Diff line
@@ -55,17 +55,6 @@ flag { 
    }

    }

}

}





flag {

    name: "consistent_get_current_input_method_info"

    namespace: "input_method"

    description: "Use BindingController as the source of truth in getCurrentInputMethodInfo"

    bug: "355034523"

    is_fixed_read_only: true

    metadata {

      purpose: PURPOSE_BUGFIX

    }

}



flag {

flag {

    name: "ime_switcher_revamp"

    name: "ime_switcher_revamp"

    is_exported: true

    is_exported: true

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

+4 −7
Original line number Original line Diff line number Diff line
@@ -1482,14 +1482,11 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl. 
        }

        }

        final InputMethodSettings settings = InputMethodSettingsRepository.get(userId);

        final InputMethodSettings settings = InputMethodSettingsRepository.get(userId);

        final String selectedImeId;

        final String selectedImeId;

        if (Flags.consistentGetCurrentInputMethodInfo()) {

        final var bindingController = getInputMethodBindingController(userId);

        final var bindingController = getInputMethodBindingController(userId);

        synchronized (ImfLock.class) {

        synchronized (ImfLock.class) {

            selectedImeId = bindingController.getSelectedMethodId();

            selectedImeId = bindingController.getSelectedMethodId();

        }

        }

        } else {



            selectedImeId = settings.getSelectedInputMethod();

        }

        return settings.getMethodMap().get(selectedImeId);

        return settings.getMethodMap().get(selectedImeId);

    }

    }