Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 611cb3ff authored by Chavi Weingarten's avatar Chavi Weingarten Committed by android-build-merger
Browse files

Merge "Merge transactions to parent if layer is going to be removed." into pi-dev

am: c3a808d9

Change-Id: Ia2dbd9ead5de401739c633f5ea5942efac223f8a
parents 6509c8d7 c3a808d9
Loading
Loading
Loading
Loading
+8 −1
Original line number Diff line number Diff line
@@ -285,7 +285,14 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
        }

        if (mSurfaceControl != null) {
            getPendingTransaction().destroy(mSurfaceControl);
            mPendingTransaction.destroy(mSurfaceControl);

            // Merge to parent transaction to ensure the transactions on this WindowContainer are
            // applied in native even if WindowContainer is removed.
            if (mParent != null) {
                mParent.getPendingTransaction().merge(mPendingTransaction);
            }

            mSurfaceControl = null;
            scheduleAnimation();
        }