Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I54afc67f5d70cc35b7de7fc7e15fbf6639092a19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Garfield Tan
2023-04-05 21:54:36 +00:00
committed by Automerger Merge Worker
parent 09a4a93e5b 6773f05a20
commit a2d021d4ca
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/wm/LaunchParamsPersister.java
View File

@@ -263,8 +263,8 @@ class LaunchParamsPersister {
boolean changed = !Objects.equals(params.mDisplayUniqueId, info.uniqueId); boolean changed = !Objects.equals(params.mDisplayUniqueId, info.uniqueId);
params.mDisplayUniqueId = info.uniqueId; params.mDisplayUniqueId = info.uniqueId;
changed |= params.mWindowingMode != task.getTaskDisplayArea().getWindowingMode(); changed |= params.mWindowingMode != task.getWindowingMode();
params.mWindowingMode = task.getTaskDisplayArea().getWindowingMode(); params.mWindowingMode = task.getWindowingMode();
if (task.mLastNonFullscreenBounds != null) { if (task.mLastNonFullscreenBounds != null) {
changed |= !Objects.equals(params.mBounds, task.mLastNonFullscreenBounds); changed |= !Objects.equals(params.mBounds, task.mLastNonFullscreenBounds);

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

@@ -111,7 +111,6 @@ public class LaunchParamsPersisterTests extends WindowTestsBase {
mDisplayUniqueId = "test:" + sNextUniqueId++; mDisplayUniqueId = "test:" + sNextUniqueId++;
mTestDisplay = new TestDisplayContent.Builder(mAtm, 1000, 1500) mTestDisplay = new TestDisplayContent.Builder(mAtm, 1000, 1500)
.setUniqueId(mDisplayUniqueId).build(); .setUniqueId(mDisplayUniqueId).build();
mTestDisplay.getDefaultTaskDisplayArea().setWindowingMode(TEST_WINDOWING_MODE);
when(mRootWindowContainer.getDisplayContent(eq(mDisplayUniqueId))) when(mRootWindowContainer.getDisplayContent(eq(mDisplayUniqueId)))
.thenReturn(mTestDisplay); .thenReturn(mTestDisplay);