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

am: 2f8bf1f024 Change-Id: I9954f6b7b7ab997391acbe3f16cbce36d9c5de3c
2016-07-19 21:12:07 +00:00
parent d7fa2e9907 2f8bf1f024
commit 8b29ace33b
1 changed files with 4 additions and 4 deletions
--- a/media/java/android/media/ImageReader.java
+++ b/media/java/android/media/ImageReader.java
@@ -512,11 +512,11 @@ public class ImageReader implements AutoCloseable {
            mAcquiredImages.clear();

            nativeClose();
-        }

-        if (mEstimatedNativeAllocBytes > 0) {
-            VMRuntime.getRuntime().registerNativeFree(mEstimatedNativeAllocBytes);
-            mEstimatedNativeAllocBytes = 0;
+            if (mEstimatedNativeAllocBytes > 0) {
+                VMRuntime.getRuntime().registerNativeFree(mEstimatedNativeAllocBytes);
+                mEstimatedNativeAllocBytes = 0;
+            }
        }
    }