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

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

Merge "Remove a special rule from setExplicitlyEnabledInputMethodSubtypes()" into main

parents c7e03983 f5f68217
Loading
Loading
Loading
Loading
+4 −7
Original line number Diff line number Diff line
@@ -4399,18 +4399,15 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl.
        final long ident = Binder.clearCallingIdentity();
        try {
            synchronized (ImfLock.class) {
                final boolean currentUser = (mCurrentUserId == userId);
                final InputMethodSettings settings = InputMethodSettingsRepository.get(userId);
                if (!settings.setEnabledInputMethodSubtypes(imeId, subtypeHashCodes)) {
                    return;
                }
                if (currentUser) {
                // To avoid unnecessary "updateInputMethodsFromSettingsLocked" from happening.
                final var userData = getUserData(userId);
                userData.mLastEnabledInputMethodsStr = settings.getEnabledInputMethodsStr();
                updateInputMethodsFromSettingsLocked(false /* enabledChanged */, userId);
            }
            }
        } finally {
            Binder.restoreCallingIdentity(ident);
        }