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

Merge "Consume sync draw handlers if the surface is destroyed" into tm-dev

Browse Source
This commit is contained in:
Riddle Hsu
2022-03-04 05:30:34 +00:00
committed by Android (Google) Code Review
parent bf1d98de72 ab8ed02c20
commit d0f3d14f8d
2 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3584,6 +3584,10 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
// Clear animating flags now, since the surface is now gone. (Note this is true even
// if the surface is saved, to outside world the surface is still NO_SURFACE.)
mAnimatingExit = false;
if (useBLASTSync()) {
immediatelyNotifyBlastSync();
}
}
void onSurfaceShownChanged(boolean shown) {

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

@@ -61,6 +61,7 @@ import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.not;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
@@ -491,6 +492,26 @@ public class WindowStateTests extends WindowTestsBase {
assertThat(app.getDisplayId(), is(mDisplayContent.getDisplayId()));
}
@Test
public void testApplyWithNextDraw() {
final WindowState win = createWindow(null, TYPE_APPLICATION_OVERLAY, "app");
final SurfaceControl.Transaction[] handledT = { null };
// The normal case that the draw transaction is applied with finishing drawing.
win.applyWithNextDraw(t -> handledT[0] = t);
assertTrue(win.useBLASTSync());
final SurfaceControl.Transaction drawT = new StubTransaction();
win.prepareDrawHandlers();
assertTrue(win.finishDrawing(drawT));
assertEquals(drawT, handledT[0]);
assertFalse(win.useBLASTSync());
// If the window is gone before reporting drawn, the sync state should be cleared.
win.applyWithNextDraw(t -> handledT[0] = t);
win.destroySurfaceUnchecked();
assertFalse(win.useBLASTSync());
assertNotEquals(drawT, handledT[0]);
}
@Test
public void testSeamlesslyRotateWindow() {
final WindowState app = createWindow(null, TYPE_APPLICATION, "app");