From ca979b9d89f30312e5040117c14b27397851de85 Mon Sep 17 00:00:00 2001
From: Chien-Yu Chen <cychen@google.com>
Date: Mon, 18 Jul 2016 17:14:27 -0700
Subject: [PATCH] ImageReader: Make close thread safe

Bug: 30191606
Change-Id: Ic5b53c416a7fe3ebcaad2ab78f2e9aef3b790c88
---
 media/java/android/media/ImageReader.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/media/java/android/media/ImageReader.java b/media/java/android/media/ImageReader.java
index ec2d4bc9170fa..682512c917087 100644
--- 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;
+            }
         }
     }