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

Commit a3d73bdc authored by Cosmin Băieș's avatar Cosmin Băieș Committed by Android (Google) Code Review
Browse files

Merge "Rm defer_show_soft_input_until_session_creation" into main

parents a805ccf4 8822f5c6

core/java/android/view/inputmethod/flags.aconfig

+0 −11
Original line number Diff line number Diff line
@@ -128,17 +128,6 @@ flag { 
    }

}



flag {

  name: "defer_show_soft_input_until_session_creation"

  namespace: "input_method"

  description: "Defers showSoftInput until the IME session has been created."

  bug: "337766845"

  is_fixed_read_only: true

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}



flag {

  name: "compatchange_for_zerojankproxy"

  namespace: "input_method"

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

+2 −8
Original line number Diff line number Diff line
@@ -3531,14 +3531,8 @@ public final class InputMethodManagerService implements IInputMethodManagerImpl. 
        final IInputMethodInvoker curMethod = bindingController.getCurMethod();

        ImeTracker.forLogging().onCancelled(userData.mCurStatsToken,

                ImeTracker.PHASE_SERVER_WAIT_IME);

        final boolean readyToDispatchToIme;

        if (Flags.deferShowSoftInputUntilSessionCreation()) {

            readyToDispatchToIme =

                    curMethod != null && userData.mCurClient != null

        final boolean readyToDispatchToIme = curMethod != null && userData.mCurClient != null

                && userData.mCurClient.mCurSession != null;

        } else {

            readyToDispatchToIme = curMethod != null;

        }

        if (readyToDispatchToIme) {

            ImeTracker.forLogging().onProgress(statsToken, ImeTracker.PHASE_SERVER_HAS_IME);

            userData.mCurStatsToken = null;