commit c8da02b4d395eea50d7b0a36c84f0851df11e063
author The Android Automerger <android-build@google.com> Tue Feb 17 20:44:04 2015 -0800
committer The Android Automerger <android-build@google.com> Tue Feb 17 20:44:04 2015 -0800
tree 14d1e19d728de2af47b228d223b7dbe54b94f160
parent 4526f47a64402a5273ff28b15e2042154affb2d7
parent 8d9a6c09331bbaa03bb5efe3c60571d9a49121b7

merge in lmp-mr1-nova-release history after reset to lmp-mr1-dev

camera/QCamera2/HAL3/QCamera3Channel.cpp

diff --git a/camera/QCamera2/HAL3/QCamera3Channel.cpp b/camera/QCamera2/HAL3/QCamera3Channel.cpp
index 6212159..ae042e0 100755
--- a/camera/QCamera2/HAL3/QCamera3Channel.cpp
+++ b/camera/QCamera2/HAL3/QCamera3Channel.cpp
@@ -927,7 +927,11 @@
 
 QCamera3PicChannel::~QCamera3PicChannel()
 {
-    int32_t rc = m_postprocessor.deinit();
+    int32_t rc = m_postprocessor.stop();
+    if (rc != NO_ERROR) {
+        ALOGE("%s: Postprocessor stop failed", __func__);
+    }
+    rc = m_postprocessor.deinit();
     if (rc != 0) {
         ALOGE("De-init Postprocessor failed");
     }