Merge "Ensure that two threads cannot simultaneously close SurfaceImage" into tm-dev (2a3064a2) · Commits · e / os / android_frameworks_base

media/java/android/media/ImageReader.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -643,6 +643,9 @@ public class ImageReader implements AutoCloseable {

		/**
		* <p>Return the frame to the ImageReader for reuse.</p>
		*
		* This method should only be called via {@link SurfaceImage#close} which ensures that image
		* closing is atomic.
		*/
		private void releaseImage(Image i) {
		if (! (i instanceof SurfaceImage) ) {
		@@ -1125,6 +1128,8 @@ public class ImageReader implements AutoCloseable {
		}

		private class SurfaceImage extends android.media.Image {
		private final Object mCloseLock = new Object();

		public SurfaceImage(int format) {
		mFormat = format;
		mHardwareBufferFormat = ImageReader.this.mHardwareBufferFormat;
		@@ -1139,8 +1144,10 @@ public class ImageReader implements AutoCloseable {

		@Override
		public void close() {
		synchronized (this.mCloseLock) {
		ImageReader.this.releaseImage(this);
		}
		}

		public ImageReader getReader() {
		return ImageReader.this;