commit 19aac2354e6f920138c65c367911d13407f0eb18
author Tony Huang <tonyychuang@google.com> Wed Mar 22 14:08:50 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 22 14:08:50 2023 +0000
tree 7881ce2819ab0a8fafccde72904fe165841994bf
parent 64444077e8ac2cf72ebf2343ee38ff9ab93a6b95
parent ad9f2eab6f87197feec68405e1c2e616d938ec0b

Merge "Fix flicker when create split from taskbar" into tm-qpr-dev am: 417cc2dbcb am: ad9f2eab6f

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

Change-Id: I00be869891e70f585902cf66a7a30eb1c3f5b823
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java
index def945e..33cbdac 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java
@@ -1335,7 +1335,7 @@
                     mMainStage.deactivate(finishedWCT, childrenToTop == mMainStage /* toTop */);
                     mSideStage.removeAllTasks(finishedWCT, childrenToTop == mSideStage /* toTop */);
                     finishedWCT.reorder(mRootTaskInfo.token, false /* toTop */);
-                    setRootForceTranslucent(true, wct);
+                    setRootForceTranslucent(true, finishedWCT);
                     finishedWCT.setBounds(mSideStage.mRootTaskInfo.token, mTempRect1);
                     mSyncQueue.queue(finishedWCT);
                     mSyncQueue.runInSync(at -> {