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

Commit 20fedf9d authored by Felix Stern's avatar Felix Stern Committed by Android (Google) Code Review
Browse files

Merge "Remove invokeOnImeRequestedChangedListener call if input target != control target" into main

parents 2d8946ad 13d5dce5

services/core/java/com/android/server/wm/ImeInsetsSourceProvider.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -346,12 +346,15 @@ final class ImeInsetsSourceProvider extends InsetsSourceProvider { 
                ImeTracker.forLogging().onProgress(statsToken,

                ImeTracker.forLogging().onProgress(statsToken,

                        ImeTracker.PHASE_WM_SET_REMOTE_TARGET_IME_VISIBILITY);

                        ImeTracker.PHASE_WM_SET_REMOTE_TARGET_IME_VISIBILITY);

                controlTarget.setImeInputTargetRequestedVisibility(imeVisible);

                controlTarget.setImeInputTargetRequestedVisibility(imeVisible);

                // not all virtual displays have an ImeInsetsSourceProvider, so it is not

                // guaranteed that the IME will be started when the control target reports its

                // requested visibility back. Thus, invoking the listener here.

                invokeOnImeRequestedChangedListener(imeInsetsTarget, statsToken);

            } else {

            } else {

                ImeTracker.forLogging().onFailed(statsToken,

                ImeTracker.forLogging().onFailed(statsToken,

                        ImeTracker.PHASE_WM_SET_REMOTE_TARGET_IME_VISIBILITY);

                        ImeTracker.PHASE_WM_SET_REMOTE_TARGET_IME_VISIBILITY);

            }

            }

        }

        }

        invokeOnImeRequestedChangedListener(imeInsetsTarget, statsToken);

    }

    }





    // TODO(b/353463205) check callers to see if we can make statsToken @NonNull

    // TODO(b/353463205) check callers to see if we can make statsToken @NonNull