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

Commit 3d07d1ad authored by Igor Murashkin's avatar Igor Murashkin
Browse files

camera: Let #connectLegacy calls through with unspecified HAL version 

This enables the camera2 shim to open a camera1 device without
turning the error codes into a RuntimeException.

Change-Id: I08d9d1e30e72025c41bd54b702d7ae95b32257be
parent 23307f73

services/camera/libcameraservice/CameraService.cpp

+8 −1
Original line number Diff line number Diff line
@@ -791,7 +791,14 @@ status_t CameraService::connectLegacy( 
        /*out*/

        sp<ICamera>& device) {



    if (mModule->common.module_api_version < CAMERA_MODULE_API_VERSION_2_3) {

    if (halVersion != CAMERA_HAL_API_VERSION_UNSPECIFIED &&

            mModule->common.module_api_version < CAMERA_MODULE_API_VERSION_2_3) {

        /*

         * Either the HAL version is unspecified in which case this just creates

         * a camera client selected by the latest device version, or

         * it's a particular version in which case the HAL must supported

         * the open_legacy call

         */

        ALOGE("%s: camera HAL module version %x doesn't support connecting to legacy HAL devices!",

                __FUNCTION__, mModule->common.module_api_version);

        return INVALID_OPERATION;