commit e97cb4926b5080b601f5a7e0300bc23dfaffc10b
author Shuzhen Wang <shuzhenw@codeaurora.org> Thu Jul 18 00:29:33 2013 -0700
committer Iliyan Malchev <malchev@google.com> Thu Jul 18 01:11:46 2013 -0700
tree 4f6198952fe24448d3a8d3d9d65534995f682000
parent 64d84c9dc599fd870c54673188a6c7467735e221

Camera3: Protect against deleting un-initialized channel obj

Bug: 9886166
Change-Id: Ibe2f6a93180ad7e02842d3d80fd95ca35551c9c3
Signed-off-by: Iliyan Malchev <malchev@google.com>

camera/QCamera2/HAL3/QCamera3Channel.cpp

diff --git a/camera/QCamera2/HAL3/QCamera3Channel.cpp b/camera/QCamera2/HAL3/QCamera3Channel.cpp
index d18564b..75e1fa1 100644
--- a/camera/QCamera2/HAL3/QCamera3Channel.cpp
+++ b/camera/QCamera2/HAL3/QCamera3Channel.cpp
@@ -130,9 +130,12 @@
             mStreams[i] = 0;
         }
     }
+    if (m_handle) {
+        m_camOps->delete_channel(m_camHandle, m_handle);
+        ALOGE("%s: deleting channel %d", __func__, m_handle);
+        m_handle = 0;
+    }
     m_numStreams = 0;
-    m_camOps->delete_channel(m_camHandle, m_handle);
-    m_handle = 0;
 }
 
 /*===========================================================================