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

Merge "Prevent setting position to a surface attached to leash" into tm-qpr-dev

Browse Source
This commit is contained in:
Jerry Chang
2022-06-21 01:20:00 +00:00
committed by Android (Google) Code Review
parent 8700cb4b2e 4915f0b290
commit eecdde1839
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -809,7 +809,8 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
}; };
private final Consumer<SurfaceControl.Transaction> mSetSurfacePositionConsumer = t -> { private final Consumer<SurfaceControl.Transaction> mSetSurfacePositionConsumer = t -> {
if (mSurfaceControl != null && mSurfaceControl.isValid()) { // Only apply the position to the surface when there's no leash created.
if (mSurfaceControl != null && mSurfaceControl.isValid() && !mSurfaceAnimator.hasLeash()) {
t.setPosition(mSurfaceControl, mSurfacePosition.x, mSurfacePosition.y); t.setPosition(mSurfaceControl, mSurfacePosition.x, mSurfacePosition.y);
} }
}; };