commit f67622707f184bb0b24da586049e1495713aae39
author Chien-Yu Chen <cychen@google.com> Fri Sep 09 20:10:24 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 09 20:10:25 2016 +0000
tree 167a2bb076548ad951dac2bcc5bf1357432b33dd
parent 9337971ab38effcc414691a4e10cfd887784b81c
parent cb9e825306cd0a97e50a4ef9d7c58f4e961692d9

Merge "CameraSource: Close native handle if camera is closed" into nyc-mr1-dev

media/libstagefright/CameraSource.cpp

diff --git a/media/libstagefright/CameraSource.cpp b/media/libstagefright/CameraSource.cpp
index e087249..893da89 100644
--- a/media/libstagefright/CameraSource.cpp
+++ b/media/libstagefright/CameraSource.cpp
@@ -1117,6 +1117,9 @@
         int64_t token = IPCThreadState::self()->clearCallingIdentity();
         mCamera->releaseRecordingFrameHandle(handle);
         IPCThreadState::self()->restoreCallingIdentity(token);
+    } else {
+        native_handle_close(handle);
+        native_handle_delete(handle);
     }
 }