diff options
| author | Akwasi Boateng <akwasi.boateng@ti.com> | 2011-09-09 12:50:14 -0500 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2011-09-12 16:09:58 -0700 |
| commit | 6b5eaf29c3d17a24731bf9271bd0d199d433813e (patch) | |
| tree | f7877ae0abae6f4c1c08068092bb88842444a7e3 /camera/AppCallbackNotifier.cpp | |
| parent | 470b7353f563741371ebd464f6c4a662f45e65c4 (diff) | |
| download | hardware_ti_omap4xxx-6b5eaf29c3d17a24731bf9271bd0d199d433813e.zip hardware_ti_omap4xxx-6b5eaf29c3d17a24731bf9271bd0d199d433813e.tar.gz hardware_ti_omap4xxx-6b5eaf29c3d17a24731bf9271bd0d199d433813e.tar.bz2 | |
Unblock semaphores during Fatal Errors
1. Remove all pending events and unblock
all waiting semaphore during Fatal error.
2. Exit execution when in invalid state.
3. Remove error nitiifcation from
Appcallback thread
Change-Id: I1612ff75e83ebf285d4cc168a829e0f81d4968b1
Signed-off-by: Akwasi Boateng <akwasi.boateng@ti.com>
Diffstat (limited to 'camera/AppCallbackNotifier.cpp')
| -rw-r--r-- | camera/AppCallbackNotifier.cpp | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/camera/AppCallbackNotifier.cpp b/camera/AppCallbackNotifier.cpp index b737c75..9ff7946 100644 --- a/camera/AppCallbackNotifier.cpp +++ b/camera/AppCallbackNotifier.cpp @@ -174,12 +174,13 @@ void AppCallbackNotifier::errorNotify(int error) CAMHAL_LOGEB("AppCallbackNotifier received error %d", error); - ///Notify errors to application in callback thread. Post error event to event queue - TIUTILS::Message msg; - msg.command = AppCallbackNotifier::NOTIFIER_CMD_PROCESS_ERROR; - msg.arg1 = (void*)error; - - mEventQ.put(&msg); + if ( ( NULL != mCameraHal ) && + ( NULL != mNotifyCb ) && + ( mCameraHal->msgTypeEnabled(CAMERA_MSG_ERROR) ) ) + { + CAMHAL_LOGEB("AppCallbackNotifier mNotifyCb %d", error); + mNotifyCb(CAMERA_MSG_ERROR, CAMERA_ERROR_UNKNOWN, 0, mCallbackCookie); + } LOG_FUNCTION_NAME_EXIT; } @@ -340,18 +341,6 @@ void AppCallbackNotifier::notifyEvent() } break; - - case AppCallbackNotifier::NOTIFIER_CMD_PROCESS_ERROR: - - if ( ( NULL != mCameraHal ) && - ( NULL != mNotifyCb ) && - ( mCameraHal->msgTypeEnabled(CAMERA_MSG_ERROR) ) ) - { - mNotifyCb(CAMERA_MSG_ERROR, CAMERA_ERROR_UNKNOWN, 0, mCallbackCookie); - } - - break; - } if ( NULL != evt ) |