From 81a47cd9cd53c030121e3ca5cd66644e4274b2a4 Mon Sep 17 00:00:00 2001
From: Garfield Tan <xutan@google.com>
Date: Tue, 4 Apr 2023 17:42:27 -0700
Subject: [PATCH] Save tasks' windowing modes instead of TDA's

This is a partial revert of commit
3b72c868c4ac3ee4302034847b5d1e0f5f03bcf0.

Bug: 274657898
Test: atest LaunchParamsPersisterTests
Test: atest ActivityEmbeddingLaunchTests
Change-Id: Ie11b5109a6eaec4a51619dab50ea2e16a40083f6
---
 .../java/com/android/server/wm/LaunchParamsPersister.java     | 4 ++--
 .../src/com/android/server/wm/LaunchParamsPersisterTests.java | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/services/core/java/com/android/server/wm/LaunchParamsPersister.java b/services/core/java/com/android/server/wm/LaunchParamsPersister.java
index bb50372ba019a..bf511adf0bf9a 100644
--- a/services/core/java/com/android/server/wm/LaunchParamsPersister.java
+++ b/services/core/java/com/android/server/wm/LaunchParamsPersister.java
@@ -263,8 +263,8 @@ class LaunchParamsPersister {
         boolean changed = !Objects.equals(params.mDisplayUniqueId, info.uniqueId);
         params.mDisplayUniqueId = info.uniqueId;
 
-        changed |= params.mWindowingMode != task.getTaskDisplayArea().getWindowingMode();
-        params.mWindowingMode = task.getTaskDisplayArea().getWindowingMode();
+        changed |= params.mWindowingMode != task.getWindowingMode();
+        params.mWindowingMode = task.getWindowingMode();
 
         if (task.mLastNonFullscreenBounds != null) {
             changed |= !Objects.equals(params.mBounds, task.mLastNonFullscreenBounds);
diff --git a/services/tests/wmtests/src/com/android/server/wm/LaunchParamsPersisterTests.java b/services/tests/wmtests/src/com/android/server/wm/LaunchParamsPersisterTests.java
index 43fc1c43d6ba2..7cb7c79d63a08 100644
--- a/services/tests/wmtests/src/com/android/server/wm/LaunchParamsPersisterTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/LaunchParamsPersisterTests.java
@@ -111,7 +111,6 @@ public class LaunchParamsPersisterTests extends WindowTestsBase {
         mDisplayUniqueId = "test:" + sNextUniqueId++;
         mTestDisplay = new TestDisplayContent.Builder(mAtm, 1000, 1500)
                 .setUniqueId(mDisplayUniqueId).build();
-        mTestDisplay.getDefaultTaskDisplayArea().setWindowingMode(TEST_WINDOWING_MODE);
         when(mRootWindowContainer.getDisplayContent(eq(mDisplayUniqueId)))
                 .thenReturn(mTestDisplay);