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

Commit fdb85847 authored by Huihong Luo's avatar Huihong Luo Committed by Automerger Merge Worker
Browse files

Merge "Fix leakage of ASurfaceTransactionCallback" into sc-dev am: f410f813 

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

Change-Id: Iff8450e21585a439ee59c523e3cf7d7f23a580f1
parents 27744c49 f410f813

core/java/android/view/ViewRootImpl.java

+6 −0
Original line number Diff line number Diff line
@@ -1356,6 +1356,11 @@ public final class ViewRootImpl implements ViewParent, 
        }

    }



    /**

     * Register a callback to be executed when Webview overlay needs to merge a transaction.

     * This callback will be executed on RenderThread worker thread, and released inside native code

     * when CanvasContext is destroyed.

     */

    private void addASurfaceTransactionCallback() {

        HardwareRenderer.ASurfaceTransactionCallback callback = (nativeTransactionObj,

                                                                 nativeSurfaceControlObj,
@@ -7710,6 +7715,7 @@ public final class ViewRootImpl implements ViewParent, 
                }

            }

            if (mAttachInfo.mThreadedRenderer != null) {

                addASurfaceTransactionCallback();

                mAttachInfo.mThreadedRenderer.setSurfaceControl(mSurfaceControl);

            }

        } else {

libs/hwui/renderthread/CanvasContext.cpp

+4 −0
Original line number Diff line number Diff line
@@ -195,6 +195,10 @@ void CanvasContext::setSurfaceControl(ASurfaceControl* surfaceControl) { 


    auto funcs = mRenderThread.getASurfaceControlFunctions();



    if (surfaceControl == nullptr) {

        setASurfaceTransactionCallback(nullptr);

    }



    if (mSurfaceControl != nullptr) {

        funcs.unregisterListenerFunc(this, &onSurfaceStatsAvailable);

        funcs.releaseFunc(mSurfaceControl);