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

Merge "Only reset layout seq when moved to a new display." into qt-dev am: cee859e26e

Browse Source 
am: a2b9d58dcb

Change-Id: I53cdf061a69b2df365e31cbf00fbe0f25fa8ef09
This commit is contained in:
Garfield Tan
2019-04-16 10:50:29 -07:00
committed by android-build-merger
parent b2ccd31b2c a2b9d58dcb
commit c02e2d407d
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/WindowState.java
View File

@@ -1305,7 +1305,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
void onDisplayChanged(DisplayContent dc) {
super.onDisplayChanged(dc);
// Window was not laid out for this display yet, so make sure mLayoutSeq does not match.
if (dc != null) {
if (dc != null && mInputWindowHandle.displayId != dc.getDisplayId()) {
mLayoutSeq = dc.mLayoutSeq - 1;
mInputWindowHandle.displayId = dc.getDisplayId();
}

4
services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java
View File

@@ -397,7 +397,9 @@ public class WindowStateTests extends WindowTestsBase {
app.mLayoutSeq = 1;
mDisplayContent.mLayoutSeq = 1;
app.onDisplayChanged(mDisplayContent);
DisplayContent newDisplay = createNewDisplay();
app.onDisplayChanged(newDisplay);
assertThat(app.mLayoutSeq, not(is(mDisplayContent.mLayoutSeq)));
}