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

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

Merge "ImageWriter: remove mCloseLock guard from queue and dequeue operations"... 

Merge "ImageWriter: remove mCloseLock guard from queue and dequeue operations" into tm-qpr-dev am: 8809b275 am: 495a2cf4

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



Change-Id: Ib021de921754cf6fe9df56e36319f68768e8df9e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fda1d43c 495a2cf4

media/java/android/media/ImageWriter.java

+51 −57
Original line number Diff line number Diff line
@@ -431,7 +431,6 @@ public class ImageWriter implements AutoCloseable { 
     * @see Image#close

     */

    public Image dequeueInputImage() {

        synchronized (mCloseLock) {

        if (mDequeuedImages.size() >= mMaxImages) {

            throw new IllegalStateException(

                    "Already dequeued max number of Images " + mMaxImages);
@@ -442,7 +441,6 @@ public class ImageWriter implements AutoCloseable { 
        newImage.mIsImageValid = true;

        return newImage;

    }

    }



    /**

     * <p>
@@ -500,7 +498,6 @@ public class ImageWriter implements AutoCloseable { 
            throw new IllegalArgumentException("image shouldn't be null");

        }



        synchronized (mCloseLock) {

        boolean ownedByMe = isImageOwnedByMe(image);

        if (ownedByMe && !(((WriterSurfaceImage) image).mIsImageValid)) {

            throw new IllegalStateException("Image from ImageWriter is invalid");
@@ -547,7 +544,6 @@ public class ImageWriter implements AutoCloseable { 
            wi.mIsImageValid = false;

        }

    }

    }



    /**

     * Get the ImageWriter format.
@@ -681,11 +677,11 @@ public class ImageWriter implements AutoCloseable { 
     */

    @Override

    public void close() {

        setOnImageReleasedListener(null, null);

        synchronized (mCloseLock) {

            if (!mIsWriterValid) {

                return;

            }

            setOnImageReleasedListener(null, null);

            for (Image image : mDequeuedImages) {

                image.close();

            }
@@ -817,14 +813,12 @@ public class ImageWriter implements AutoCloseable { 
        }



        final Handler handler;

        final boolean isWriterValid;

        synchronized (iw.mListenerLock) {

            handler = iw.mListenerHandler;

        }

        synchronized (iw.mCloseLock) {

            isWriterValid = iw.mIsWriterValid;

        }

        if (handler != null && isWriterValid) {



        if (handler != null) {

            // The ListenerHandler will take care of ensuring that the parent ImageWriter is valid

            handler.sendEmptyMessage(0);

        }

    }