1 files changed, 5 insertions, 17 deletions
diff --git a/camera/AppCallbackNotifier.cpp b/camera/AppCallbackNotifier.cpp
index cc53fb4..784d042 100644
--- a/camera/AppCallbackNotifier.cpp
+++ b/camera/AppCallbackNotifier.cpp
@@ -1618,30 +1618,18 @@ status_t AppCallbackNotifier::releaseRecordingFrame(const void* mem)
 
 status_t AppCallbackNotifier::enableMsgType(int32_t msgType)
 {
-    if(msgType & CAMERA_MSG_POSTVIEW_FRAME)
-        {
-        mFrameProvider->enableFrameNotification(CameraFrame::SNAPSHOT_FRAME);
-        }
-
-    if(msgType & CAMERA_MSG_PREVIEW_FRAME)
-        {
-         mFrameProvider->enableFrameNotification(CameraFrame::PREVIEW_FRAME_SYNC);
-        }
+    if( msgType & (CAMERA_MSG_POSTVIEW_FRAME | CAMERA_MSG_PREVIEW_FRAME) ) {
+        mFrameProvider->enableFrameNotification(CameraFrame::PREVIEW_FRAME_SYNC);
+    }
 
     return NO_ERROR;
 }
 
 status_t AppCallbackNotifier::disableMsgType(int32_t msgType)
 {
-    if(msgType & CAMERA_MSG_POSTVIEW_FRAME)
-        {
-        mFrameProvider->disableFrameNotification(CameraFrame::SNAPSHOT_FRAME);
-        }
-
-    if(msgType & CAMERA_MSG_PREVIEW_FRAME)
-        {
+    if(!mCameraHal->msgTypeEnabled(CAMERA_MSG_PREVIEW_FRAME | CAMERA_MSG_POSTVIEW_FRAME)) {
         mFrameProvider->disableFrameNotification(CameraFrame::PREVIEW_FRAME_SYNC);
-        }
+    }
 
     return NO_ERROR;