fix cts fail

2 files changed, 12 insertions, 12 deletions

diff --git a/AppCallbackNotifier.cpp b/AppCallbackNotifier.cpp
index be492bd..61f063e 100755
--- a/AppCallbackNotifier.cpp
+++ b/AppCallbackNotifier.cpp
@@ -1807,8 +1807,8 @@ status_t AppCallbackNotifier::releaseRecordingFrame(const void* mem)
 
 status_t AppCallbackNotifier::enableMsgType(int32_t msgType)
 {
-    //if( msgType & (CAMERA_MSG_POSTVIEW_FRAME | CAMERA_MSG_PREVIEW_FRAME) ) {
-    if( msgType & (CAMERA_MSG_PREVIEW_FRAME) ) {
+    if( msgType & (CAMERA_MSG_POSTVIEW_FRAME | CAMERA_MSG_PREVIEW_FRAME) ) {
+    //if( msgType & (CAMERA_MSG_PREVIEW_FRAME) ) {
         mFrameProvider->enableFrameNotification(CameraFrame::PREVIEW_FRAME_SYNC);
     }
     return NO_ERROR;
@@ -1817,7 +1817,7 @@ status_t AppCallbackNotifier::enableMsgType(int32_t msgType)
 status_t AppCallbackNotifier::disableMsgType(int32_t msgType)
 {
     //if(!mCameraHal->msgTypeEnabled(CAMERA_MSG_PREVIEW_FRAME | CAMERA_MSG_POSTVIEW_FRAME)) {
-    if(!mCameraHal->msgTypeEnabled(CAMERA_MSG_PREVIEW_FRAME)) {
+    if(!(msgType & (CAMERA_MSG_PREVIEW_FRAME | CAMERA_MSG_POSTVIEW_FRAME))){
         mFrameProvider->disableFrameNotification(CameraFrame::PREVIEW_FRAME_SYNC);
     }
     return NO_ERROR;
diff --git a/CameraHal.cpp b/CameraHal.cpp
index ef38d22..e5b5956 100755
--- a/CameraHal.cpp
+++ b/CameraHal.cpp
@@ -256,19 +256,19 @@ void CameraHal::enableMsgType(int32_t msgType)
 void CameraHal::disableMsgType(int32_t msgType)
 {
     LOG_FUNCTION_NAME;
-
-        {
+    int32_t CurMsg = 0;
+    {
         Mutex::Autolock lock(mLock);
         mMsgEnabled &= ~msgType;
-        }
+        CurMsg = mMsgEnabled;
+    }
 
-    if( msgType & CAMERA_MSG_PREVIEW_FRAME)
-        {
+    if( msgType & CAMERA_MSG_PREVIEW_FRAME){
         CAMHAL_LOGDA("Disabling Preview Callback");
-        }
+    }
 
     ///Configure app callback notifier
-    mAppCallbackNotifier->disableMsgType (msgType);
+    mAppCallbackNotifier->disableMsgType (CurMsg);
 
     LOG_FUNCTION_NAME_EXIT;
 }
@@ -2631,8 +2631,8 @@ status_t CameraHal::takePicture( )
                 ret = mDisplayAdapter->pauseDisplay(mDisplayPaused);
                 // since preview is paused we should stop sending preview frames too
                 if(mMsgEnabled & CAMERA_MSG_PREVIEW_FRAME) {
-                    LOGD("disable MSG_PREVIEW_FRAME");
-                    mAppCallbackNotifier->disableMsgType (CAMERA_MSG_PREVIEW_FRAME);
+                    mAppCallbackNotifier->disableMsgType (mMsgEnabled & CAMERA_MSG_POSTVIEW_FRAME);
+                    CAMHAL_LOGDA("disable MSG_PREVIEW_FRAME");
                 }
             }