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

Commit 2f8bf1f0 authored by Chien-Yu Chen's avatar Chien-Yu Chen Committed by Android (Google) Code Review
Browse files

Merge "ImageReader: Make close thread safe" into nyc-mr1-dev

parents 50805412 ca979b9d

media/java/android/media/ImageReader.java

+4 −4
Original line number Original line Diff line number Diff line
@@ -512,13 +512,13 @@ public class ImageReader implements AutoCloseable { 
            mAcquiredImages.clear();

            mAcquiredImages.clear();





            nativeClose();

            nativeClose();

        }





            if (mEstimatedNativeAllocBytes > 0) {

            if (mEstimatedNativeAllocBytes > 0) {

                VMRuntime.getRuntime().registerNativeFree(mEstimatedNativeAllocBytes);

                VMRuntime.getRuntime().registerNativeFree(mEstimatedNativeAllocBytes);

                mEstimatedNativeAllocBytes = 0;

                mEstimatedNativeAllocBytes = 0;

            }

            }

        }

        }

    }





    @Override

    @Override

    protected void finalize() throws Throwable {

    protected void finalize() throws Throwable {