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

Commit 2d20900b authored by Chavi Weingarten's avatar Chavi Weingarten Committed by Automerger Merge Worker
Browse files

Merge "Immediately apply transaction when hw rendering is disabled" into sc-v2-dev am: 6ee187a3 

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

Change-Id: I147e5ccc971c5e8a7005cbe7ed3e5b324f400f05
parents 412d897f 6ee187a3

core/java/android/view/ViewRootImpl.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -208,13 +208,13 @@ import java.io.PrintWriter; 
import java.io.StringWriter;

import java.io.StringWriter;

import java.lang.ref.WeakReference;

import java.lang.ref.WeakReference;

import java.util.ArrayList;

import java.util.ArrayList;

import java.util.function.Consumer;

import java.util.HashSet;

import java.util.HashSet;

import java.util.LinkedList;

import java.util.LinkedList;

import java.util.List;

import java.util.List;

import java.util.Objects;

import java.util.Objects;

import java.util.Queue;

import java.util.Queue;

import java.util.concurrent.CountDownLatch;

import java.util.concurrent.CountDownLatch;

import java.util.function.Consumer;





/**

/**

 * The top of a view hierarchy, implementing the needed protocol between View

 * The top of a view hierarchy, implementing the needed protocol between View
@@ -10518,7 +10518,7 @@ public final class ViewRootImpl implements ViewParent, 




    @Override

    @Override

    public boolean applyTransactionOnDraw(@NonNull SurfaceControl.Transaction t) {

    public boolean applyTransactionOnDraw(@NonNull SurfaceControl.Transaction t) {

        if (mRemoved) {

        if (mRemoved || !isHardwareEnabled()) {

            t.apply();

            t.apply();

        } else {

        } else {

            registerRtFrameCallback(frame -> mergeWithNextTransaction(t, frame));

            registerRtFrameCallback(frame -> mergeWithNextTransaction(t, frame));