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

Commit 0a600d9d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Attempt to fix updateImeParent transaction synchronized issue" into sc-v2-dev am: a70a32a9 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16512320

Change-Id: I3a727c9e2a65e90bbdd2c317a8a7f403cc6feec0
parents 31abbf9b a70a32a9

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -4165,10 +4165,10 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
        final SurfaceControl newParent = computeImeParent();

        final SurfaceControl newParent = computeImeParent();

        if (newParent != null && newParent != mInputMethodSurfaceParent) {

        if (newParent != null && newParent != mInputMethodSurfaceParent) {

            mInputMethodSurfaceParent = newParent;

            mInputMethodSurfaceParent = newParent;

            getPendingTransaction().reparent(mImeWindowsContainer.mSurfaceControl, newParent);

            getSyncTransaction().reparent(mImeWindowsContainer.mSurfaceControl, newParent);

            // When surface parent is removed, the relative layer will also be removed. We need to

            // When surface parent is removed, the relative layer will also be removed. We need to

            // do a force update to make sure there is a layer set for the new parent.

            // do a force update to make sure there is a layer set for the new parent.

            assignRelativeLayerForIme(getPendingTransaction(), true /* forceUpdate */);

            assignRelativeLayerForIme(getSyncTransaction(), true /* forceUpdate */);

            scheduleAnimation();

            scheduleAnimation();

        }

        }

    }

    }