commit 2f8bf1f024a63041693ff2a1e04269b2cbff8b36
author Chien-Yu Chen <cychen@google.com> Tue Jul 19 21:05:35 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 19 21:05:37 2016 +0000
tree 2d33dc62b2c5bf856bb4c13f8a40d5e449e59b9e
parent 50805412c8de7ccac7fa63aa87283fdf6a35c812
parent ca979b9d89f30312e5040117c14b27397851de85

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

media/java/android/media/ImageReader.java

diff --git a/media/java/android/media/ImageReader.java b/media/java/android/media/ImageReader.java
index ec2d4bc..682512c 100644
--- a/media/java/android/media/ImageReader.java
+++ b/media/java/android/media/ImageReader.java
@@ -512,11 +512,11 @@
             mAcquiredImages.clear();
 
             nativeClose();
-        }
 
-        if (mEstimatedNativeAllocBytes > 0) {
-            VMRuntime.getRuntime().registerNativeFree(mEstimatedNativeAllocBytes);
-            mEstimatedNativeAllocBytes = 0;
+            if (mEstimatedNativeAllocBytes > 0) {
+                VMRuntime.getRuntime().registerNativeFree(mEstimatedNativeAllocBytes);
+                mEstimatedNativeAllocBytes = 0;
+            }
         }
     }