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

Commit 7e490e46 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix bug in insets animation when hw acceleration unavailable"

parents 2afa9abc baea62af

core/java/android/view/ViewRootInsetsControllerHost.java

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ public class ViewRootInsetsControllerHost implements InsetsController.Host { 
            //  frame instead.

            final SurfaceControl.Transaction t = new SurfaceControl.Transaction();

            mApplier.applyParams(t, params);

            mApplier.applyTransaction(t, -1);

            t.apply();

        }

    }

core/jni/android_graphics_BLASTBufferQueue.cpp

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ static void nativeMergeWithNextTransaction(JNIEnv*, jclass clazz, jlong ptr, jlo 
                                           jlong framenumber) {

    sp<BLASTBufferQueue> queue = reinterpret_cast<BLASTBufferQueue*>(ptr);

    auto transaction = reinterpret_cast<SurfaceComposerClient::Transaction*>(transactionPtr);

    queue->mergeWithNextTransaction(transaction, framenumber);

    queue->mergeWithNextTransaction(transaction, CC_UNLIKELY(framenumber < 0) ? 0 : framenumber);

}



static jlong nativeGetLastAcquiredFrameNum(JNIEnv* env, jclass clazz, jlong ptr) {