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

Commit 285c6dea authored by Nikolas Havrikov's avatar Nikolas Havrikov
Browse files

Remove parameter from current input binding 

Bug: 205676419
Test: make
Change-Id: I331567a5072916d477af6a9ccad99a3a9d7d6cc1
parent ba37769c

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

+4 −5
Original line number Diff line number Diff line
@@ -1985,8 +1985,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
    }



    @GuardedBy("mMethodMap")

    private boolean bindCurrentInputMethodServiceLocked(

            Intent service, ServiceConnection conn, int flags) {

    private boolean bindCurrentInputMethodServiceLocked(ServiceConnection conn, int flags) {

        Intent service = getCurIntent();

        if (service == null || conn == null) {

            Slog.e(TAG, "--- bind failed: service = " + service + ", conn = " + conn);

            return false;
@@ -3211,8 +3211,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
                    showInputToken));

            mInputShown = true;

            if (hasConnection() && !isVisibleBound()) {

                bindCurrentInputMethodServiceLocked(

                        getCurIntent(), getVisibleConnection(), IME_VISIBLE_BIND_FLAGS);

                bindCurrentInputMethodServiceLocked(getVisibleConnection(), IME_VISIBLE_BIND_FLAGS);

                setVisibleBound(true);

            }

            res = true;
@@ -3228,7 +3227,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub 
                Slog.w(TAG, "Force disconnect/connect to the IME in showCurrentInputLocked()");

                ServiceConnection connection = getMainConnection();

                mContext.unbindService(connection);

                bindCurrentInputMethodServiceLocked(getCurIntent(), connection,

                bindCurrentInputMethodServiceLocked(connection,

                        mImeConnectionBindFlags);

            } else {

                if (DEBUG) {