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

Commit f3304bfd authored by Avichal Rakesh's avatar Avichal Rakesh Committed by Automerger Merge Worker
Browse files

Merge "Ensure that two threads cannot simultaneously close SurfaceImage" into... 

Merge "Ensure that two threads cannot simultaneously close SurfaceImage" into tm-dev am: 2a3064a2 am: bbc581b7

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18152523



Change-Id: I38d79ae6d0a1ebcd8f908d7031d1659345459e17
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3c8f5db8 bbc581b7

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;