Merge "CameraService: Disable capture message types before stopping preview" into jellybean

    Mutex::Autolock lock(mLock);

    if (checkPidAndHardware() != NO_ERROR) return;

#ifdef OMAP_ENHANCEMENT

    // According to framework documentation, preview needs

    // to be started for image capture. This will make sure

    // that image capture related messages get disabled if

    // not done already in their respective handlers.

    // If these messages come when in the midddle of

    // stopping preview we will deadlock the system in

    // lockIfMessageWanted().

    disableMsgType(CAMERA_MSG_POSTVIEW_FRAME);

#endif

    disableMsgType(CAMERA_MSG_PREVIEW_FRAME);

    mHardware->stopPreview();