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

Commit 81a47cd9 authored by Garfield Tan's avatar Garfield Tan
Browse files

Save tasks' windowing modes instead of TDA's 

This is a partial revert of commit
3b72c868.

Bug: 274657898
Test: atest LaunchParamsPersisterTests
Test: atest ActivityEmbeddingLaunchTests
Change-Id: Ie11b5109a6eaec4a51619dab50ea2e16a40083f6
parent e5a27a72

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

+2 −2
Original line number Diff line number Diff line
@@ -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);

services/tests/wmtests/src/com/android/server/wm/LaunchParamsPersisterTests.java

+0 −1
Original line number Diff line number Diff line
@@ -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);