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

Create surfacecontrol before layout in relayoutWindow

Browse Source 
If there is no surfacecontrol, relayout is skipped. This is
often fine because a later surfaceplacement pass usually
happens; however, when combined with commitFinishDrawingLocked
being out-of-order with layout during traversal, a race can
happen where relayoutWindow creates the surface (after
surface placement) and then commitFinishDrawing runs immediately
after that causing a windowanimation to use non-laid-out
surface positions.

Bug: 174636007
Test: Use logging to verify that layout/surface-placement happen
      during relayoutWindow on a new window.
Change-Id: Ic9d17e3d26de2ecd082e4fff642c1d456a7b071e
This commit is contained in:
Evan Rosky
2021-01-11 17:19:42 +00:00
parent 48e84f968f
commit 23c07addaf
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -2393,15 +2393,9 @@ public class WindowManagerService extends IWindowManager.Stub
} }
} }
// We may be deferring layout passes at the moment, but since the client is interested // Create surfaceControl before surface placement otherwise layout will be skipped
// in the new out values right now we need to force a layout. // (because WS.isGoneForLayout() is true when there is no surface.
mWindowPlacerLocked.performSurfacePlacement(true /* force */);
if (shouldRelayout) { if (shouldRelayout) {
Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "relayoutWindow: viewVisibility_1");
result = win.relayoutVisibleWindow(result);
try { try {
result = createSurfaceControl(outSurfaceControl, result, win, winAnimator); result = createSurfaceControl(outSurfaceControl, result, win, winAnimator);
} catch (Exception e) { } catch (Exception e) {
@@ -2413,6 +2407,17 @@ public class WindowManagerService extends IWindowManager.Stub
Binder.restoreCallingIdentity(origId); Binder.restoreCallingIdentity(origId);
return 0; return 0;
} }
}
// We may be deferring layout passes at the moment, but since the client is interested
// in the new out values right now we need to force a layout.
mWindowPlacerLocked.performSurfacePlacement(true /* force */);
if (shouldRelayout) {
Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "relayoutWindow: viewVisibility_1");
result = win.relayoutVisibleWindow(result);
if ((result & WindowManagerGlobal.RELAYOUT_RES_FIRST_TIME) != 0) { if ((result & WindowManagerGlobal.RELAYOUT_RES_FIRST_TIME) != 0) {
focusMayChange = true; focusMayChange = true;
} }