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

Commit eb714f3d authored May 16, 2016 by Hans Boehm Committed by android-build-merger May 16, 2016

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

am: 53c33d97

* commit '53c33d97':
  Clear more native pointers in finalizers

Change-Id: I0e28a59e0f2d60b38a5e2bdd55bbd72ec1da42d9

parents 5f8c5ec9 53c33d97

graphics/java/android/graphics/Camera.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -163,6 +163,7 @@ public class Camera {
	protected void finalize() throws Throwable {		protected void finalize() throws Throwable {
	try {		try {
	nativeDestructor();		nativeDestructor();
			native_instance = 0;
	} finally {		} finally {
	super.finalize();		super.finalize();
	}		}

graphics/java/android/graphics/ColorFilter.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -40,6 +40,7 @@ public class ColorFilter {
	super.finalize();		super.finalize();
	} finally {		} finally {
	destroyFilter(native_instance);		destroyFilter(native_instance);
			native_instance = 0;
	}		}
	}		}

graphics/java/android/graphics/DrawFilter.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -33,6 +33,7 @@ public class DrawFilter {
	protected void finalize() throws Throwable {		protected void finalize() throws Throwable {
	try {		try {
	nativeDestructor(mNativeInt);		nativeDestructor(mNativeInt);
			mNativeInt = 0;
	} finally {		} finally {
	super.finalize();		super.finalize();
	}		}

graphics/java/android/graphics/Movie.java

+2 −1

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

	public class Movie {		public class Movie {
	private final long mNativeMovie;		private long mNativeMovie;

	private Movie(long nativeMovie) {		private Movie(long nativeMovie) {
	if (nativeMovie == 0) {		if (nativeMovie == 0) {
	@@ -82,6 +82,7 @@ public class Movie {
	protected void finalize() throws Throwable {		protected void finalize() throws Throwable {
	try {		try {
	nativeDestructor(mNativeMovie);		nativeDestructor(mNativeMovie);
			mNativeMovie = 0;
	} finally {		} finally {
	super.finalize();		super.finalize();
	}		}

graphics/java/android/graphics/Rasterizer.java

+1 −0

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

	protected void finalize() throws Throwable {		protected void finalize() throws Throwable {
	finalizer(native_instance);		finalizer(native_instance);
			native_instance = 0;
	}		}

	private static native void finalizer(long native_instance);		private static native void finalizer(long native_instance);