Merge changes I3ad8bfec,I61902102 (8920286c) · Commits · e / os / android_frameworks_base

data/etc/services.core.protolog.json

+6 −6

Original line number	Diff line number	Diff line
		@@ -1063,6 +1063,12 @@
		"group": "WM_DEBUG_TASKS",
		"at": "com\/android\/server\/wm\/ActivityTaskSupervisor.java"
		},
		"-856590985": {
		"message": "dcTarget: %s mImeRequester: %s",
		"level": "DEBUG",
		"group": "WM_DEBUG_IME",
		"at": "com\/android\/server\/wm\/ImeInsetsSourceProvider.java"
		},
		"-856025122": {
		"message": "SURFACE transparentRegionHint=%s: %s",
		"level": "INFO",
		@@ -2377,12 +2383,6 @@
		"group": "WM_ERROR",
		"at": "com\/android\/server\/wm\/WindowManagerService.java"
		},
		"632168013": {
		"message": "dcTarget: %s mImeTargetFromIme: %s",
		"level": "DEBUG",
		"group": "WM_DEBUG_IME",
		"at": "com\/android\/server\/wm\/ImeInsetsSourceProvider.java"
		},
		"633654009": {
		"message": "SURFACE POS (setPositionInTransaction) @ (%f,%f): %s",
		"level": "INFO",

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

+109 −44

Original line number	Diff line number	Diff line
		@@ -553,24 +553,56 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		* This just indicates the window the input method is on top of, not
		* necessarily the window its input is going to.
		*/
		WindowState mInputMethodTarget;
		private WindowState mImeLayeringTarget;

		/**
		* The window which receives input from the input method. This is also a candidate of the
		* input method control target.
		*/
		WindowState mInputMethodInputTarget;
		private WindowState mImeInputTarget;

		/**
		* This controls the visibility and animation of the input method window.
		*/
		InsetsControlTarget mInputMethodControlTarget;
		private InsetsControlTarget mImeControlTarget;

		/**
		* Used by {@link #getImeTarget} to return the IME target which the input method window on
		* top of for adjusting input method window surface layer Z-Ordering.
		*
		* @see #mImeLayeringTarget
		*/
		static final int IME_TARGET_LAYERING = 0;

		/**
		* Used by {@link #getImeTarget} to return the IME target which received the input connection
		* from IME.
		*
		* @see #mImeInputTarget
		*/
		static final int IME_TARGET_INPUT = 1;

		/**
		* Used by {@link #getImeTarget} to return the IME target which controls the IME insets
		* visibility and animation.
		*
		* @see #mImeControlTarget
		*/
		static final int IME_TARGET_CONTROL = 2;

		@IntDef(flag = false, prefix = { "IME_TARGET_" }, value = {
		IME_TARGET_LAYERING,
		IME_TARGET_INPUT,
		IME_TARGET_CONTROL,
		})
		@Retention(RetentionPolicy.SOURCE)
		@interface InputMethodTarget {}

		/** The surface parent of the IME container. */
		private SurfaceControl mInputMethodSurfaceParent;

		/** If true hold off on modifying the animation layer of mInputMethodTarget */
		boolean mInputMethodTargetWaitingAnim;
		/** If {@code true} hold off on modifying the animation layer of {@link #mImeLayeringTarget} */
		boolean mImeLayeringTargetWaitingAnim;

		private final PointerEventDispatcher mPointerEventDispatcher;

		@@ -815,7 +847,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp

		private final Consumer<WindowState> mApplyPostLayoutPolicy =
		w -> getDisplayPolicy().applyPostLayoutPolicyLw(w, w.mAttrs, w.getParentWindow(),
		mInputMethodTarget);
		mImeLayeringTarget);

		private final Consumer<WindowState> mApplySurfaceChangesTransaction = w -> {
		final WindowSurfacePlacer surfacePlacer = mWmService.mWindowPlacerLocked;
		@@ -2943,15 +2975,15 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		proto.write(FOCUSED_ROOT_TASK_ID, INVALID_TASK_ID);
		}
		proto.write(DISPLAY_READY, isReady());
		if (mInputMethodTarget != null) {
		mInputMethodTarget.dumpDebug(proto, INPUT_METHOD_TARGET, logLevel);
		if (mImeLayeringTarget != null) {
		mImeLayeringTarget.dumpDebug(proto, INPUT_METHOD_TARGET, logLevel);
		}
		if (mInputMethodInputTarget != null) {
		mInputMethodInputTarget.dumpDebug(proto, INPUT_METHOD_INPUT_TARGET, logLevel);
		if (mImeInputTarget != null) {
		mImeInputTarget.dumpDebug(proto, INPUT_METHOD_INPUT_TARGET, logLevel);
		}
		if (mInputMethodControlTarget != null
		&& mInputMethodControlTarget.getWindow() != null) {
		mInputMethodControlTarget.getWindow().dumpDebug(proto, INPUT_METHOD_CONTROL_TARGET,
		if (mImeControlTarget != null
		&& mImeControlTarget.getWindow() != null) {
		mImeControlTarget.getWindow().dumpDebug(proto, INPUT_METHOD_CONTROL_TARGET,
		logLevel);
		}
		if (mCurrentFocus != null) {
		@@ -3207,7 +3239,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		boolean imWindowChanged = false;
		final WindowState imWindow = mInputMethodWindow;
		if (imWindow != null) {
		final WindowState prevTarget = mInputMethodTarget;
		final WindowState prevTarget = mImeLayeringTarget;
		final WindowState newTarget = computeImeTarget(true /* updateImeTarget*/);
		imWindowChanged = prevTarget != newTarget;

		@@ -3461,7 +3493,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		}

		/**
		* Determine and return the window that should be the IME target.
		* Determine and return the window that should be the IME target for layering the IME window.
		* @param updateImeTarget If true the system IME target will be updated to match what we found.
		* @return The window that should be used as the IME target or null if there isn't any.
		*/
		@@ -3470,13 +3502,13 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		// There isn't an IME so there shouldn't be a target...That was easy!
		if (updateImeTarget) {
		if (DEBUG_INPUT_METHOD) Slog.w(TAG_WM, "Moving IM target from "
		+ mInputMethodTarget + " to null since mInputMethodWindow is null");
		setInputMethodTarget(null, mInputMethodTargetWaitingAnim);
		+ mImeLayeringTarget + " to null since mInputMethodWindow is null");
		setImeLayeringTarget(null, mImeLayeringTargetWaitingAnim);
		}
		return null;
		}

		final WindowState curTarget = mInputMethodTarget;
		final WindowState curTarget = mImeLayeringTarget;
		if (!canUpdateImeTarget()) {
		if (DEBUG_INPUT_METHOD) Slog.w(TAG_WM, "Defer updating IME target");
		return curTarget;
		@@ -3531,7 +3563,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		if (DEBUG_INPUT_METHOD) Slog.w(TAG_WM, "Moving IM target from " + curTarget
		+ " to null." + (SHOW_STACK_CRAWLS ? " Callers="
		+ Debug.getCallers(4) : ""));
		setInputMethodTarget(null, mInputMethodTargetWaitingAnim);
		setImeLayeringTarget(null, mImeLayeringTargetWaitingAnim);
		}

		return null;
		@@ -3558,7 +3590,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		if (mAppTransition.isTransitionSet()) {
		// If we are currently setting up for an animation, hold everything until we
		// can find out what will happen.
		setInputMethodTarget(highestTarget, true);
		setImeLayeringTarget(highestTarget, true);
		return highestTarget;
		}
		}
		@@ -3566,7 +3598,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp

		if (DEBUG_INPUT_METHOD) Slog.w(TAG_WM, "Moving IM target from " + curTarget + " to "
		+ target + (SHOW_STACK_CRAWLS ? " Callers=" + Debug.getCallers(4) : ""));
		setInputMethodTarget(target, false);
		setImeLayeringTarget(target, false);
		}

		return target;
		@@ -3577,24 +3609,24 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		* the candidate app window token if needed.
		*/
		void computeImeTargetIfNeeded(ActivityRecord candidate) {
		if (mInputMethodTarget != null && mInputMethodTarget.mActivityRecord == candidate) {
		if (mImeLayeringTarget != null && mImeLayeringTarget.mActivityRecord == candidate) {
		computeImeTarget(true /* updateImeTarget */);
		}
		}

		private boolean isImeControlledByApp() {
		return mInputMethodInputTarget != null && !WindowConfiguration.isSplitScreenWindowingMode(
		mInputMethodInputTarget.getWindowingMode());
		return mImeInputTarget != null && !WindowConfiguration.isSplitScreenWindowingMode(
		mImeInputTarget.getWindowingMode());
		}

		boolean isImeAttachedToApp() {
		return isImeControlledByApp()
		&& mInputMethodTarget != null
		&& mInputMethodTarget.mActivityRecord != null
		&& mInputMethodTarget.getWindowingMode() == WINDOWING_MODE_FULLSCREEN
		&& mImeLayeringTarget != null
		&& mImeLayeringTarget.mActivityRecord != null
		&& mImeLayeringTarget.getWindowingMode() == WINDOWING_MODE_FULLSCREEN
		// An activity with override bounds should be letterboxed inside its parent bounds,
		// so it doesn't fill the screen.
		&& mInputMethodTarget.mActivityRecord.matchParentBounds();
		&& mImeLayeringTarget.mActivityRecord.matchParentBounds();
		}

		/**
		@@ -3621,6 +3653,24 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		return statusBar != null ? statusBar : defaultDc.mRemoteInsetsControlTarget;
		}

		/**
		* Returns the corresponding IME insets control target according the IME target type.
		*
		* @param type The type of the IME target.
		* @see #IME_TARGET_LAYERING
		* @see #IME_TARGET_INPUT
		* @see #IME_TARGET_CONTROL
		*/
		InsetsControlTarget getImeTarget(@InputMethodTarget int type) {
		switch (type) {
		case IME_TARGET_LAYERING: return mImeLayeringTarget;
		case IME_TARGET_INPUT: return mImeInputTarget;
		case IME_TARGET_CONTROL: return mImeControlTarget;
		default:
		return null;
		}
		}

		@DisplayImePolicy int getImePolicy() {
		if (!isTrusted()) {
		return DISPLAY_IME_POLICY_FALLBACK_DISPLAY;
		@@ -3638,6 +3688,11 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		return mWmService.mForceDesktopModeOnExternalDisplays && !isDefaultDisplay && !isPrivate();
		}

		@VisibleForTesting
		void setImeLayeringTarget(WindowState target) {
		mImeLayeringTarget = target;
		}

		/**
		* Sets the window the IME is on top of.
		* @param target window to place the IME surface on top of. If {@code null}, the IME will be
		@@ -3645,13 +3700,13 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		* @param targetWaitingAnim if {@code true}, hold off on modifying the animation layer of
		* the target.
		*/
		private void setInputMethodTarget(@Nullable WindowState target, boolean targetWaitingAnim) {
		if (target == mInputMethodTarget && mInputMethodTargetWaitingAnim == targetWaitingAnim) {
		private void setImeLayeringTarget(@Nullable WindowState target, boolean targetWaitingAnim) {
		if (target == mImeLayeringTarget && mImeLayeringTargetWaitingAnim == targetWaitingAnim) {
		return;
		}
		ProtoLog.i(WM_DEBUG_IME, "setInputMethodTarget %s", target);
		mInputMethodTarget = target;
		mInputMethodTargetWaitingAnim = targetWaitingAnim;
		mImeLayeringTarget = target;
		mImeLayeringTargetWaitingAnim = targetWaitingAnim;

		// 1. Reparent the IME container window to the target root DA to get the correct bounds and
		// config. (Only happens when the target window is in a different root DA)
		@@ -3673,23 +3728,33 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		updateImeControlTarget();
		}

		@VisibleForTesting
		void setImeInputTarget(WindowState target) {
		mImeInputTarget = target;
		}

		@VisibleForTesting
		void setImeControlTarget(InsetsControlTarget target) {
		mImeControlTarget = target;
		}

		/**
		* The IME input target is the window which receives input from IME. It is also a candidate
		* which controls the visibility and animation of the input method window.
		*/
		void setInputMethodInputTarget(WindowState target) {
		if (mInputMethodInputTarget != target) {
		void updateImeInputAndControlTarget(WindowState target) {
		if (mImeInputTarget != target) {
		ProtoLog.i(WM_DEBUG_IME, "setInputMethodInputTarget %s", target);
		mInputMethodInputTarget = target;
		mImeInputTarget = target;
		updateImeControlTarget();
		}
		}

		void updateImeControlTarget() {
		mInputMethodControlTarget = computeImeControlTarget();
		mInsetsStateController.onImeControlTargetChanged(mInputMethodControlTarget);
		mImeControlTarget = computeImeControlTarget();
		mInsetsStateController.onImeControlTargetChanged(mImeControlTarget);

		final WindowState win = InsetsControlTarget.asWindowOrNull(mInputMethodControlTarget);
		final WindowState win = InsetsControlTarget.asWindowOrNull(mImeControlTarget);
		final IBinder token = win != null ? win.mClient.asBinder() : null;
		// Note: not allowed to call into IMMS with the WM lock held, hence the post.
		mWmService.mH.post(() ->
		@@ -3712,12 +3777,12 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		@VisibleForTesting
		InsetsControlTarget computeImeControlTarget() {
		if (!isImeControlledByApp() && mRemoteInsetsControlTarget != null
		\|\| (mInputMethodInputTarget != null
		&& getImeHostOrFallback(mInputMethodInputTarget.getWindow())
		\|\| (mImeInputTarget != null
		&& getImeHostOrFallback(mImeInputTarget.getWindow())
		== mRemoteInsetsControlTarget)) {
		return mRemoteInsetsControlTarget;
		} else {
		return mInputMethodInputTarget;
		return mImeInputTarget;
		}
		}

		@@ -3734,7 +3799,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		// screen. If it's not covering the entire screen the IME might extend beyond the apps
		// bounds.
		if (allowAttachToApp && isImeAttachedToApp()) {
		return mInputMethodTarget.mActivityRecord.getSurfaceControl();
		return mImeLayeringTarget.mActivityRecord.getSurfaceControl();
		}

		// Otherwise, we just attach it to where the display area policy put it.
		@@ -4373,7 +4438,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		private boolean skipImeWindowsDuringTraversal(DisplayContent dc) {
		// We skip IME windows so they're processed just above their target, except
		// in split-screen mode where we process the IME containers above the docked divider.
		return dc.mInputMethodTarget != null
		return dc.getImeTarget(IME_TARGET_LAYERING) != null
		&& !dc.getDefaultTaskDisplayArea().isSplitScreenModeActivated();
		}

		@@ -4488,7 +4553,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		@Override
		void assignChildLayers(SurfaceControl.Transaction t) {
		mImeWindowsContainers.setNeedsLayer();
		final WindowState imeTarget = mInputMethodTarget;
		final WindowState imeTarget = mImeLayeringTarget;
		// In the case where we have an IME target that is not in split-screen mode IME
		// assignment is easy. We just need the IME to go directly above the target. This way
		// children of the target will naturally go above the IME and everyone is happy.

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

+79 −40

Original line number	Diff line number	Diff line
		@@ -19,10 +19,14 @@ package com.android.server.wm;
		import static android.os.Trace.TRACE_TAG_WINDOW_MANAGER;

		import static com.android.internal.protolog.ProtoLogGroup.WM_DEBUG_IME;
		import static com.android.server.wm.DisplayContent.IME_TARGET_CONTROL;
		import static com.android.server.wm.DisplayContent.IME_TARGET_INPUT;
		import static com.android.server.wm.DisplayContent.IME_TARGET_LAYERING;
		import static com.android.server.wm.ImeInsetsSourceProviderProto.IME_TARGET_FROM_IME;
		import static com.android.server.wm.ImeInsetsSourceProviderProto.INSETS_SOURCE_PROVIDER;
		import static com.android.server.wm.ImeInsetsSourceProviderProto.IS_IME_LAYOUT_DRAWN;

		import android.annotation.NonNull;
		import android.os.Trace;
		import android.util.proto.ProtoOutputStream;
		import android.view.InsetsSource;
		@@ -37,9 +41,9 @@ import java.io.PrintWriter;
		* Controller for IME inset source on the server. It's called provider as it provides the
		* {@link InsetsSource} to the client that uses it in {@link InsetsSourceConsumer}.
		*/
		class ImeInsetsSourceProvider extends InsetsSourceProvider {
		final class ImeInsetsSourceProvider extends InsetsSourceProvider {

		private InsetsControlTarget mImeTargetFromIme;
		private InsetsControlTarget mImeRequester;
		private Runnable mShowImeRunner;
		private boolean mIsImeLayoutDrawn;
		private boolean mImeShowing;
		@@ -56,12 +60,8 @@ class ImeInsetsSourceProvider extends InsetsSourceProvider {
		* @param imeTarget imeTarget on which IME request is coming from.
		*/
		void scheduleShowImePostLayout(InsetsControlTarget imeTarget) {
		boolean targetChanged = mImeTargetFromIme != imeTarget
		&& mImeTargetFromIme != null && imeTarget != null && mShowImeRunner != null
		&& imeTarget.getWindow() != null && mImeTargetFromIme.getWindow() != null
		&& mImeTargetFromIme.getWindow().mActivityRecord
		== imeTarget.getWindow().mActivityRecord;
		mImeTargetFromIme = imeTarget;
		boolean targetChanged = isTargetChangedWithinActivity(imeTarget);
		mImeRequester = imeTarget;
		if (targetChanged) {
		// target changed, check if new target can show IME.
		ProtoLog.d(WM_DEBUG_IME, "IME target changed within ActivityRecord");
		@@ -72,24 +72,24 @@ class ImeInsetsSourceProvider extends InsetsSourceProvider {
		return;
		}

		ProtoLog.d(WM_DEBUG_IME, "Schedule IME show for %s", mImeTargetFromIme.getWindow() == null
		? mImeTargetFromIme : mImeTargetFromIme.getWindow().getName());
		ProtoLog.d(WM_DEBUG_IME, "Schedule IME show for %s", mImeRequester.getWindow() == null
		? mImeRequester : mImeRequester.getWindow().getName());
		mShowImeRunner = () -> {
		ProtoLog.d(WM_DEBUG_IME, "Run showImeRunner");
		// Target should still be the same.
		if (isImeTargetFromDisplayContentAndImeSame()) {
		final InsetsControlTarget target = mDisplayContent.mInputMethodControlTarget;
		if (isReadyToShowIme()) {
		final InsetsControlTarget target = mDisplayContent.getImeTarget(IME_TARGET_CONTROL);

		ProtoLog.i(WM_DEBUG_IME, "call showInsets(ime) on %s",
		target.getWindow() != null ? target.getWindow().getName() : "");
		setImeShowing(true);
		target.showInsets(WindowInsets.Type.ime(), true /* fromIme */);
		Trace.asyncTraceEnd(TRACE_TAG_WINDOW_MANAGER, "WMS.showImePostLayout", 0);
		if (target != mImeTargetFromIme && mImeTargetFromIme != null) {
		if (target != mImeRequester && mImeRequester != null) {
		ProtoLog.w(WM_DEBUG_IME,
		"showInsets(ime) was requested by different window: %s ",
		(mImeTargetFromIme.getWindow() != null
		? mImeTargetFromIme.getWindow().getName() : ""));
		(mImeRequester.getWindow() != null
		? mImeRequester.getWindow().getName() : ""));
		}
		}
		abortShowImePostLayout();
		@@ -100,8 +100,7 @@ class ImeInsetsSourceProvider extends InsetsSourceProvider {
		void checkShowImePostLayout() {
		// check if IME is drawn
		if (mIsImeLayoutDrawn
		\|\| (mImeTargetFromIme != null
		&& isImeTargetFromDisplayContentAndImeSame()
		\|\| (isReadyToShowIme()
		&& mWin != null
		&& mWin.isDrawn()
		&& !mWin.mGivenInsetsPending)) {
		@@ -118,13 +117,13 @@ class ImeInsetsSourceProvider extends InsetsSourceProvider {
		*/
		void abortShowImePostLayout() {
		ProtoLog.d(WM_DEBUG_IME, "abortShowImePostLayout");
		mImeTargetFromIme = null;
		mImeRequester = null;
		mIsImeLayoutDrawn = false;
		mShowImeRunner = null;
		}

		@VisibleForTesting
		boolean isImeTargetFromDisplayContentAndImeSame() {
		boolean isReadyToShowIme() {
		// IMMS#mLastImeTargetWindow always considers focused window as
		// IME target, however DisplayContent#computeImeTarget() can compute
		// a different IME target.
		@@ -134,35 +133,75 @@ class ImeInsetsSourceProvider extends InsetsSourceProvider {
		// Also, if imeTarget is closing, it would be considered as outdated target.
		// TODO(b/139861270): Remove the child & sublayer check once IMMS is aware of
		// actual IME target.
		final WindowState dcTarget = mDisplayContent.mInputMethodTarget;
		final InsetsControlTarget controlTarget = mDisplayContent.mInputMethodControlTarget;
		if (dcTarget == null \|\| mImeTargetFromIme == null) {
		final InsetsControlTarget dcTarget = mDisplayContent.getImeTarget(IME_TARGET_LAYERING);
		if (dcTarget == null \|\| mImeRequester == null) {
		return false;
		}
		ProtoLog.d(WM_DEBUG_IME, "dcTarget: %s mImeTargetFromIme: %s",
		dcTarget.getName(), mImeTargetFromIme.getWindow() == null
		? mImeTargetFromIme : mImeTargetFromIme.getWindow().getName());
		ProtoLog.d(WM_DEBUG_IME, "dcTarget: %s mImeRequester: %s",
		dcTarget.getWindow().getName(), mImeRequester.getWindow() == null
		? mImeRequester : mImeRequester.getWindow().getName());

		return (!dcTarget.isClosing() && mImeTargetFromIme == dcTarget)
		\|\| (mImeTargetFromIme != null && mImeTargetFromIme.getWindow() != null
		&& dcTarget.getParentWindow() == mImeTargetFromIme
		&& dcTarget.mSubLayer > mImeTargetFromIme.getWindow().mSubLayer)
		\|\| mImeTargetFromIme == mDisplayContent.getImeFallback()
		\|\| mImeTargetFromIme == mDisplayContent.mInputMethodInputTarget
		\|\| controlTarget == mImeTargetFromIme
		&& (mImeTargetFromIme.getWindow() == null
		\|\| !mImeTargetFromIme.getWindow().isClosing());
		return isImeLayeringTarget(mImeRequester, dcTarget)
		\|\| isAboveImeLayeringTarget(mImeRequester, dcTarget)
		\|\| isImeFallbackTarget(mImeRequester)
		\|\| isImeInputTarget(mImeRequester)
		\|\| sameAsImeControlTarget();
		}

		// ---------------------------------------------------------------------------------------
		// Methods for checking IME insets target changing state.
		//
		private static boolean isImeLayeringTarget(@NonNull InsetsControlTarget target,
		@NonNull InsetsControlTarget dcTarget) {
		return !dcTarget.getWindow().isClosing() && target == dcTarget;
		}

		private static boolean isAboveImeLayeringTarget(@NonNull InsetsControlTarget target,
		@NonNull InsetsControlTarget dcTarget) {
		return target.getWindow() != null
		&& dcTarget.getWindow().getParentWindow() == target
		&& dcTarget.getWindow().mSubLayer > target.getWindow().mSubLayer;
		}

		private boolean isImeFallbackTarget(InsetsControlTarget target) {
		return target == mDisplayContent.getImeFallback();
		}

		private boolean isImeInputTarget(InsetsControlTarget target) {
		return target == mDisplayContent.getImeTarget(IME_TARGET_INPUT);
		}

		private boolean sameAsImeControlTarget() {
		final InsetsControlTarget target = mDisplayContent.getImeTarget(IME_TARGET_CONTROL);
		return target == mImeRequester
		&& (mImeRequester.getWindow() == null
		\|\| !mImeRequester.getWindow().isClosing());
		}

		private boolean isTargetChangedWithinActivity(InsetsControlTarget target) {
		// We don't consider the target out of the activity.
		if (target == null \|\| target.getWindow() == null) {
		return false;
		}
		return mImeRequester != target
		&& mImeRequester != null && mShowImeRunner != null
		&& mImeRequester.getWindow() != null
		&& mImeRequester.getWindow().mActivityRecord
		== target.getWindow().mActivityRecord;
		}
		// ---------------------------------------------------------------------------------------

		@Override
		public void dump(PrintWriter pw, String prefix) {
		super.dump(pw, prefix);
		pw.print(prefix);
		pw.print("mImeShowing=");
		pw.print(mImeShowing);
		if (mImeTargetFromIme != null) {
		pw.print(" showImePostLayout pending for mImeTargetFromIme=");
		pw.print(mImeTargetFromIme);
		if (mImeRequester != null) {
		pw.print(prefix);
		pw.print("showImePostLayout pending for mImeRequester=");
		pw.print(mImeRequester);
		pw.println();
		}
		pw.println();
		}
		@@ -171,8 +210,8 @@ class ImeInsetsSourceProvider extends InsetsSourceProvider {
		void dumpDebug(ProtoOutputStream proto, long fieldId, @WindowTraceLogLevel int logLevel) {
		final long token = proto.start(fieldId);
		super.dumpDebug(proto, INSETS_SOURCE_PROVIDER, logLevel);
		if (mImeTargetFromIme != null) {
		mImeTargetFromIme.getWindow().dumpDebug(proto, IME_TARGET_FROM_IME, logLevel);
		if (mImeRequester != null) {
		mImeRequester.getWindow().dumpDebug(proto, IME_TARGET_FROM_IME, logLevel);
		}
		proto.write(IS_IME_LAYOUT_DRAWN, mIsImeLayoutDrawn);
		proto.end(token);

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

+3 −2

File changed.

Preview size limit exceeded, changes collapsed.

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

+22 −19

File changed.

Preview size limit exceeded, changes collapsed.