From 40b4afb004ad91bfe2e50ff9d16df5c62b60807f Mon Sep 17 00:00:00 2001
From: Vishnu Nair <vishnun@google.com>
Date: Fri, 10 Apr 2020 08:55:25 -0700
Subject: [PATCH] Preserve windows when resizing tasks

If the activity doesn't handle a configuration change and needs to be
relaunched, preserve the windows to prevent a flicker.

Test: resize in split screen and observe there is no flicker
Fixes: 153583483
Change-Id: Ibe71035da9eb2bd9dca270e7eca8e47afbffcb78
---
 .../java/com/android/server/wm/WindowOrganizerController.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/WindowOrganizerController.java b/services/core/java/com/android/server/wm/WindowOrganizerController.java
index 3e2e9be24c4f2..86bc013e36389 100644
--- a/services/core/java/com/android/server/wm/WindowOrganizerController.java
+++ b/services/core/java/com/android/server/wm/WindowOrganizerController.java
@@ -156,7 +156,7 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub
                         final PooledConsumer f = PooledLambda.obtainConsumer(
                                 ActivityRecord::ensureActivityConfiguration,
                                 PooledLambda.__(ActivityRecord.class), 0,
-                                false /* preserveWindow */);
+                                true /* preserveWindow */);
                         try {
                             for (int i = haveConfigChanges.size() - 1; i >= 0; --i) {
                                 haveConfigChanges.valueAt(i).forAllActivities(f);