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 am: eecdde1839

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

Change-Id: If047082059fe6021a65bdefd9d2008c454c6833e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jerry Chang
2022-06-21 01:35:40 +00:00
committed by Automerger Merge Worker
parent 582a5af844 eecdde1839
commit 760a121a5d
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);
} }
}; };