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

Commit 308798ef authored by Patrick Williams's avatar Patrick Williams Committed by Automerger Merge Worker
Browse files

Merge "Copy transaction in applyTransactionOnDraw" into udc-dev am: 33b47f6b 

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



Change-Id: I1eee1e41b75eca11793f16ee495593e703fa6c07
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9135149a 33b47f6b

core/java/android/view/ViewRootImpl.java

+5 −1
Original line number Diff line number Diff line
@@ -11365,9 +11365,13 @@ public final class ViewRootImpl implements ViewParent, 
        if (mRemoved || !isHardwareEnabled()) {

            t.apply();

        } else {

            // Copy and clear the passed in transaction for thread safety. The new transaction is

            // accessed on the render thread.

            var localTransaction = new Transaction();

            localTransaction.merge(t);

            mHasPendingTransactions = true;

            registerRtFrameCallback(frame -> {

                mergeWithNextTransaction(t, frame);

                mergeWithNextTransaction(localTransaction, frame);

            });

        }

        return true;