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

Commit a9997a38 authored by chaviw's avatar chaviw
Browse files

Remove flushShadowQueue 

flushShadowQueue no longer does anything in BBQ so remove from Java and
JNI code.

Test: Builds
Fixes: 199204968
Change-Id: I4df67a23732ba4ffaca42390b29d3f81cadd6457
parent 31142f49

core/java/android/view/ViewRootImpl.java

+1 −8
Original line number Diff line number Diff line
@@ -4086,18 +4086,16 @@ public final class ViewRootImpl implements ViewParent, 


    private void addFrameCallbackIfNeeded() {

        final boolean nextDrawUseBlastSync = mNextDrawUseBlastSync;

        final boolean reportNextDraw = mReportNextDraw;

        final boolean hasBlurUpdates = mBlurRegionAggregator.hasUpdates();

        final boolean needsCallbackForBlur = hasBlurUpdates || mBlurRegionAggregator.hasRegions();



        if (!nextDrawUseBlastSync && !reportNextDraw && !needsCallbackForBlur) {

        if (!nextDrawUseBlastSync && !needsCallbackForBlur) {

            return;

        }



        if (DEBUG_BLAST) {

            Log.d(mTag, "Creating frameDrawingCallback"

                    + " nextDrawUseBlastSync=" + nextDrawUseBlastSync

                    + " reportNextDraw=" + reportNextDraw

                    + " hasBlurUpdates=" + hasBlurUpdates);

        }

        mWaitForBlastSyncComplete = nextDrawUseBlastSync;
@@ -4137,11 +4135,6 @@ public final class ViewRootImpl implements ViewParent, 
                    }

                    mHandler.postAtFrontOfQueue(this::clearBlastSync);

                });

            } else if (reportNextDraw) {

                // If we need to report next draw, wait for adapter to flush its shadow queue

                // by processing previously queued buffers so that we can submit the

                // transaction a timely manner.

                mBlastBufferQueue.flushShadowQueue();

            }

        };

        registerRtFrameCallback(frameDrawingCallback);

core/jni/android_graphics_BLASTBufferQueue.cpp

+0 −6
Original line number Diff line number Diff line
@@ -112,11 +112,6 @@ static void nativeUpdate(JNIEnv* env, jclass clazz, jlong ptr, jlong surfaceCont 
                  transaction);

}



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

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

    queue->flushShadowQueue();

}



static void nativeMergeWithNextTransaction(JNIEnv*, jclass clazz, jlong ptr, jlong transactionPtr,

                                           jlong framenumber) {

    sp<BLASTBufferQueue> queue = reinterpret_cast<BLASTBufferQueue*>(ptr);
@@ -152,7 +147,6 @@ static const JNINativeMethod gMethods[] = { 
        {"nativeDestroy", "(J)V", (void*)nativeDestroy},

        {"nativeSetNextTransaction", "(JJ)V", (void*)nativeSetNextTransaction},

        {"nativeUpdate", "(JJJJIJ)V", (void*)nativeUpdate},

        {"nativeFlushShadowQueue", "(J)V", (void*)nativeFlushShadowQueue},

        {"nativeMergeWithNextTransaction", "(JJJ)V", (void*)nativeMergeWithNextTransaction},

        {"nativeSetTransactionCompleteCallback",

                "(JJLandroid/graphics/BLASTBufferQueue$TransactionCompleteCallback;)V",

graphics/java/android/graphics/BLASTBufferQueue.java

+0 −5
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ public final class BLASTBufferQueue { 
    private static native void nativeSetNextTransaction(long ptr, long transactionPtr);

    private static native void nativeUpdate(long ptr, long surfaceControl, long width, long height,

            int format, long transactionPtr);

    private static native void nativeFlushShadowQueue(long ptr);

    private static native void nativeMergeWithNextTransaction(long ptr, long transactionPtr,

                                                              long frameNumber);

    private static native void nativeSetTransactionCompleteCallback(long ptr, long frameNumber,
@@ -125,10 +124,6 @@ public final class BLASTBufferQueue { 
        }

    }



    public void flushShadowQueue() {

        nativeFlushShadowQueue(mNativeObject);

    }



    /**

     * Merge the transaction passed in to the next transaction in BlastBufferQueue. The next

     * transaction will be applied or merged when the next frame with specified frame number