From a7f6e13ed76b109a66a8a079eab17802fb120533 Mon Sep 17 00:00:00 2001
From: Tony Huang <tonyychuang@google.com>
Date: Thu, 8 Jun 2023 02:37:44 +0000
Subject: [PATCH] Fix multiple divider when resize with rotate

When animatePendingSplitWithDisplayChange, we should update the
divider layout, but it used start transaction was already applied
by other handler, we should apply itself otherwise the previous
divider surface cannot be remove.

Fix: 286322573
Test: manual
Test: check winscope there is only one divider surface after repro
Test: pass existing tests
Change-Id: Ia4f44b474eda9bad4f5968a217a06a834c4bd542
---
 .../src/com/android/wm/shell/splitscreen/StageCoordinator.java   | 1 +
 1 file changed, 1 insertion(+)

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 c8e88fcc0a6af..be3ba2eebfcc8 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
@@ -2500,6 +2500,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
             if (mMixedHandler.animatePendingSplitWithDisplayChange(transition, info,
                     startTransaction, finishTransaction, finishCallback)) {
                 mSplitLayout.update(startTransaction);
+                startTransaction.apply();
                 return true;
             }
         }