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

Commit a68b7460 authored by Garfield Tan's avatar Garfield Tan Committed by Automerger Merge Worker
Browse files

Merge "Save tasks' windowing modes instead of TDA's" into udc-dev am: 6773f05a 

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



Change-Id: I4ae6e80fb83a7f74a7854af2d93669de7526498e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fcea0ec0 6773f05a

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);