Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2dec60f authored by Piyush Balwani's avatar Piyush Balwani Committed by Bernhard Thoben
Browse files

kitakami-common: camera: QCamera2: Fix build error for a new SP 

 * Note, the fix seems incorrect in QCameraStateMachine as
   fall-through is intended as the signal won't be sent, so
   change the break to fallthrough.

Change-Id: Ia8cb92afc246bfb7ae7a9f2eac90fcdc518e426e
parent f2217a35

camera/QCamera2/HAL/QCamera2HWI.cpp

+1 −0
Original line number Diff line number Diff line
@@ -6051,6 +6051,7 @@ void QCamera2HardwareInterface::camEvtHandle(uint32_t /*camera_handle*/, 
                        obj->mDefCond.broadcast();

                        LOGH("broadcast mDefCond signal\n");

                    }

                    break;

                default:

                    obj->processEvt(QCAMERA_SM_EVT_EVT_NOTIFY, payload);

                    break;

camera/QCamera2/HAL/QCameraStateMachine.cpp

+3 −0
Original line number Diff line number Diff line
@@ -637,6 +637,7 @@ int32_t QCameraStateMachine::procEvtPreviewStoppedState(qcamera_sm_evt_enum_t ev 
            LOGW("Free video handle %d %d", evt, m_state);

            QCameraVideoMemory::closeNativeHandle((const void *)payload);

        }

        [[clang::fallthrough]];

    case QCAMERA_SM_EVT_PRE_START_RECORDING:

    case QCAMERA_SM_EVT_RESTART_STOP_PREVIEW:

    case QCAMERA_SM_EVT_RESTART_START_PREVIEW:
@@ -1057,6 +1058,7 @@ int32_t QCameraStateMachine::procEvtPreviewReadyState(qcamera_sm_evt_enum_t evt, 
            LOGW("Free video handle %d %d", evt, m_state);

            QCameraVideoMemory::closeNativeHandle((const void *)payload);

        }

        [[clang::fallthrough]];

    case QCAMERA_SM_EVT_PRE_START_RECORDING:

    case QCAMERA_SM_EVT_RESTART_STOP_PREVIEW:

    case QCAMERA_SM_EVT_RESTART_START_PREVIEW:
@@ -1593,6 +1595,7 @@ int32_t QCameraStateMachine::procEvtPreviewingState(qcamera_sm_evt_enum_t evt, 
            LOGW("Free video handle %d %d", evt, m_state);

            QCameraVideoMemory::closeNativeHandle((const void *)payload);

        }

        [[clang::fallthrough]];

    case QCAMERA_SM_EVT_CANCEL_PICTURE:

    case QCAMERA_SM_EVT_STOP_RECORDING:

    case QCAMERA_SM_EVT_RELEASE: