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

Commit d6d155f1 authored by Nikolas Havrikov's avatar Nikolas Havrikov
Browse files

Move clear current method caller into controller 

Bug: 205676419
Test: make
Change-Id: I4b3cbcd1681bae662e644a5c86b5b63df6bf4612
parent 4f78d0e8

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

+4 −3
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ final class InputMethodBindingController { 
                    // We consider this to be a new bind attempt, since the system

                    // should now try to restart the service for us.

                    mLastBindTime = SystemClock.uptimeMillis();

                    mService.clearClientSessionsLocked();

                    clearCurMethodAndSessionsLocked();

                    mService.clearInputShowRequestLocked();

                    mService.unbindCurrentClientLocked(UnbindReason.DISCONNECT_IME);

                }
@@ -358,11 +358,12 @@ final class InputMethodBindingController { 
        }



        mCurId = null;

        mService.clearClientSessionsLocked();

        clearCurMethodAndSessionsLocked();

    }



    @GuardedBy("mMethodMap")

    void clearCurMethodLocked() {

    private void clearCurMethodAndSessionsLocked() {

        mService.clearClientSessionsLocked();

        mCurMethod = null;

        mCurMethodUid = Process.INVALID_UID;

    }

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

+0 −1
Original line number Diff line number Diff line
@@ -2590,7 +2590,6 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 


            finishSessionLocked(mEnabledSession);

            mEnabledSession = null;

            mBindingController.clearCurMethodLocked();

            scheduleNotifyImeUidToAudioService(Process.INVALID_UID);

        }

        hideStatusBarIconLocked();