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

Commit 53c33d97 authored by Hans Boehm's avatar Hans Boehm Committed by Android (Google) Code Review
Browse files

Merge "Clear more native pointers in finalizers" into nyc-dev

parents 008d73bd 0d65743f

graphics/java/android/graphics/Camera.java

+1 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ public class Camera { 
    protected void finalize() throws Throwable {

        try {

            nativeDestructor();

            native_instance = 0;

        } finally {

            super.finalize();

        }

graphics/java/android/graphics/ColorFilter.java

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ public class ColorFilter { 
            super.finalize();

        } finally {

            destroyFilter(native_instance);

            native_instance = 0;

        }

    }

graphics/java/android/graphics/DrawFilter.java

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ public class DrawFilter { 
    protected void finalize() throws Throwable {

        try {

            nativeDestructor(mNativeInt);

            mNativeInt = 0;

        } finally {

            super.finalize();

        }

graphics/java/android/graphics/Movie.java

+2 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ import java.io.InputStream; 
import java.io.FileInputStream;



public class Movie {

    private final long mNativeMovie;

    private long mNativeMovie;



    private Movie(long nativeMovie) {

        if (nativeMovie == 0) {
@@ -82,6 +82,7 @@ public class Movie { 
    protected void finalize() throws Throwable {

        try {

            nativeDestructor(mNativeMovie);

            mNativeMovie = 0;

        } finally {

            super.finalize();

        }

graphics/java/android/graphics/Rasterizer.java

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ public class Rasterizer { 


    protected void finalize() throws Throwable {

        finalizer(native_instance);

        native_instance = 0;

    }



    private static native void finalizer(long native_instance);