diff options
author | Nanako Baba <baba@ti.com> | 2013-02-19 17:34:48 +0900 |
---|---|---|
committer | Hashcode <hashcode0f@gmail.com> | 2015-02-03 13:39:28 -0800 |
commit | 3c1d9ceb8868e53c421baed0fd8666c59b28759e (patch) | |
tree | 3845dfa165f579b56d5980ae6c3021dd27dc5a8d | |
parent | 5602082ce3b3922820e9c442f5b6c9284f3e2620 (diff) | |
download | hardware_ti_omap4-3c1d9ceb8868e53c421baed0fd8666c59b28759e.zip hardware_ti_omap4-3c1d9ceb8868e53c421baed0fd8666c59b28759e.tar.gz hardware_ti_omap4-3c1d9ceb8868e53c421baed0fd8666c59b28759e.tar.bz2 |
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>
-rwxr-xr-x[-rw-r--r--] | camera/OMXCameraAdapter/OMXCameraAdapter.cpp | 6 |
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(); |