Merge "Sync surface position for animation in core" into tm-qpr-dev

2022-07-07 09:14:44 +00:00
parent 4d18194054 e453728b69
commit ba151e624d
1 changed files with 4 additions and 0 deletions
--- a/services/core/java/com/android/server/wm/WindowContainer.java
+++ b/services/core/java/com/android/server/wm/WindowContainer.java
@@ -3216,6 +3216,10 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<

    void resetSurfacePositionForAnimationLeash(Transaction t) {
        t.setPosition(mSurfaceControl, 0, 0);
+        if (mSyncState != SYNC_STATE_NONE && t != mSyncTransaction) {
+            // Avoid restoring to old position if the sync transaction is applied later.
+            mSyncTransaction.setPosition(mSurfaceControl, 0, 0);
+        }
        mLastSurfacePosition.set(0, 0);
    }