Merge "Properly guard access to CloseGuard in finalizers." (1163568d) · Commits · e / os / android_frameworks_base

core/java/android/content/ContentProviderClient.java

+8 −2

Original line number	Diff line number	Diff line
		@@ -524,7 +524,10 @@ public class ContentProviderClient implements AutoCloseable {
		@Override
		protected void finalize() throws Throwable {
		try {
		if (mCloseGuard != null) {
		mCloseGuard.warnIfOpen();
		}

		close();
		} finally {
		super.finalize();
		@@ -579,7 +582,10 @@ public class ContentProviderClient implements AutoCloseable {
		@Override
		protected void finalize() throws Throwable {
		try {
		if (mCloseGuard != null) {
		mCloseGuard.warnIfOpen();
		}

		close();
		} finally {
		super.finalize();

+4 −1

Original line number	Diff line number	Diff line
		@@ -2942,7 +2942,10 @@ public abstract class ContentResolver {
		@Override
		protected void finalize() throws Throwable {
		try {
		if (mCloseGuard != null) {
		mCloseGuard.warnIfOpen();
		}

		close();
		} finally {
		super.finalize();

+4 −1

Original line number	Diff line number	Diff line
		@@ -152,7 +152,10 @@ public final class SensorDirectChannel implements AutoCloseable {
		@Override
		protected void finalize() throws Throwable {
		try {
		if (mCloseGuard != null) {
		mCloseGuard.warnIfOpen();
		}

		close();
		} finally {
		super.finalize();

+3 −1

Original line number	Diff line number	Diff line
		@@ -332,7 +332,9 @@ public class UsbDeviceConnection {
		@Override
		protected void finalize() throws Throwable {
		try {
		if (mCloseGuard != null) {
		mCloseGuard.warnIfOpen();
		}
		} finally {
		super.finalize();
		}

+4 −1

Original line number	Diff line number	Diff line
		@@ -116,7 +116,10 @@ public class UsbRequest {
		@Override
		protected void finalize() throws Throwable {
		try {
		if (mCloseGuard != null) {
		mCloseGuard.warnIfOpen();
		}

		close();
		} finally {
		super.finalize();