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

Commit 4fbe677f authored by Tiger Huang's avatar Tiger Huang
Browse files

Revert "Only use the IME target from IMMS to update the IME control target" 

This reverts commit 304db431.

Reason for revert: This CL broke a test: b/153606760
Bug: 153606760
Change-Id: I6034fad7f88de14518ea9f46bf8774e4b8196926
parent 304db431

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

+2 −4
Original line number Diff line number Diff line
@@ -197,6 +197,7 @@ import android.view.ViewRootImpl; 
import android.view.WindowInsets;

import android.view.WindowManager;

import android.view.WindowManagerPolicyConstants.PointerEventListener;

import android.window.ITaskOrganizer;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.logging.MetricsLogger;
@@ -3425,10 +3426,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo 


    private void setInputMethodTarget(WindowState target, boolean targetWaitingAnim) {

        // Always update control target. This is needed to handle rotation.

        // We cannot set target as the control target, because mInputMethodTarget can only help

        // decide the z-order of IME, but cannot control IME. Only the IME target reported from

        // updateInputMethodTargetWindow can control IME.

        updateImeControlTarget(mInputMethodControlTarget);

        updateImeControlTarget(target);

        if (target == mInputMethodTarget && mInputMethodTargetWaitingAnim == targetWaitingAnim) {

            return;

        }