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

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

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

parents d1e1e47b 140b1cc1

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

+1 −5
Original line number Diff line number Diff line
@@ -4358,7 +4358,6 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl. 
            }



            final var additionalSubtypeMap = AdditionalSubtypeMapRepository.get(userId);

            final boolean isCurrentUser = (mCurrentUserId == userId);

            final InputMethodSettings settings = InputMethodSettingsRepository.get(userId);

            final var newAdditionalSubtypeMap = settings.getNewAdditionalSubtypeMap(

                    imiId, toBeAdded, additionalSubtypeMap, mPackageManagerInternal, callingUid);
@@ -4372,10 +4371,7 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl. 
                            mUserManagerInternal.isUserUnlockingOrUnlocked(userId));

                    final var newSettings = InputMethodSettings.create(methodMap, userId);

                    InputMethodSettingsRepository.put(userId, newSettings);

                    if (isCurrentUser) {

                        postInputMethodSettingUpdatedLocked(false /* resetDefaultEnabledIme */,

                                userId);

                    }

                    postInputMethodSettingUpdatedLocked(false /* resetDefaultEnabledIme */, userId);

                } finally {

                    Binder.restoreCallingIdentity(ident);

                }