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

Commit 77ecf0bb authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

Merge "Don't make HardwareRenderer calls in the finalizer"

parents 9e0ca634 0ed751dd

core/java/android/view/RenderNode.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -909,7 +909,6 @@ public class RenderNode { 
    @Override

    @Override

    protected void finalize() throws Throwable {

    protected void finalize() throws Throwable {

        try {

        try {

            destroyDisplayListData();

            nDestroyDisplayList(mNativeDisplayList);

            nDestroyDisplayList(mNativeDisplayList);

        } finally {

        } finally {

            super.finalize();

            super.finalize();

core/java/android/view/ThreadedRenderer.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -253,6 +253,7 @@ public class ThreadedRenderer extends HardwareRenderer { 
    protected void finalize() throws Throwable {

    protected void finalize() throws Throwable {

        try {

        try {

            nDeleteProxy(mNativeProxy);

            nDeleteProxy(mNativeProxy);

            mNativeProxy = 0;

        } finally {

        } finally {

            super.finalize();

            super.finalize();

        }

        }