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

Commit 921858a4 authored by Antonio Kantek's avatar Antonio Kantek
Browse files

Inline IMMS#advanceSequenceNumber 

This CL represents an internal refactoring and shouldn't introduce any
observable breakage.

Bug: 325515685
Test: atest FrameworksInputMethodSystemServerTests
Test: atest CtsInputMethodTestCases
Test: atest FrameworksServicesTests
Test: atest --host FrameworksInputMethodSystemServerTestsRavenwood
Change-Id: I19da1bb049d69937aa5625f36725f37b6807009f
parent 2fe4e120

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

+2 −11
Original line number Original line Diff line number Diff line
@@ -495,16 +495,6 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl. 
        return userData.mBindingController.getSequenceNumber();

        return userData.mBindingController.getSequenceNumber();

    }

    }





    /**

     * Increase the current binding sequence number by one.

     * Reset to 1 on overflow.

     */

    @GuardedBy("ImfLock.class")

    private void advanceSequenceNumberLocked() {

        final var userData = mUserDataRepository.getOrCreate(mCurrentUserId);

        userData.mBindingController.advanceSequenceNumber();

    }



    @GuardedBy("ImfLock.class")

    @GuardedBy("ImfLock.class")

    @Nullable

    @Nullable

    InputMethodInfo queryInputMethodForCurrentUserLocked(@NonNull String imeId) {

    InputMethodInfo queryInputMethodForCurrentUserLocked(@NonNull String imeId) {
@@ -2202,7 +2192,8 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl. 
        final boolean connectionWasActive = mCurInputConnection != null;

        final boolean connectionWasActive = mCurInputConnection != null;





        // Bump up the sequence for this client and attach it.

        // Bump up the sequence for this client and attach it.

        advanceSequenceNumberLocked();

        userData.mBindingController.advanceSequenceNumber();



        mCurClient = cs;

        mCurClient = cs;

        mCurInputConnection = inputConnection;

        mCurInputConnection = inputConnection;

        mCurRemoteAccessibilityInputConnection = remoteAccessibilityInputConnection;

        mCurRemoteAccessibilityInputConnection = remoteAccessibilityInputConnection;