CameraHal: Avoid to call OMX_Deinit() twice

In the destructor of OMXCameraAdapter, OMX_Deinit() is called after OMX state
is switched to Loaded via switchToLoaded function.
But if some error happens during the state change, OMX_Deinit() is called in
switchToLoaded function.
As the result, OMX_Deinit() is called twice in swtchToLoaded and the destructor.
This causes the ducati crash.

This patch adds checking for the mOmxInitialized after switchToLoaded() to
avoid double deinitialization.

Change-Id: Ie30170de2bf032a1861a00b2ca370266fe12d339
Signed-off-by: Nanako Baba <baba@ti.com>
Signed-off-by: Daniel Levin <dendy@ti.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp
index 6166c1c..a6448c8 100644..100755
--- a/camera/OMXCameraAdapter/OMXCameraAdapter.cpp
+++ b/camera/OMXCameraAdapter/OMXCameraAdapter.cpp
@@ -4169,10 +4169,10 @@ OMXCameraAdapter::~OMXCameraAdapter()
 
     android::AutoMutex lock(gAdapterLock);
 
-    if ( mOmxInitialized ) {
-        // return to OMX Loaded state
-        switchToLoaded();
+    // return to OMX Loaded state
+    switchToLoaded();
 
+    if ( mOmxInitialized ) {
         saveDccFileDataSave();
 
         closeDccFileDataSave();