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

Commit 3d839a32 authored by Zhijun He's avatar Zhijun He Committed by Android Git Automerger
Browse files

am f05e50eb: Camera: only return static metadata for HAL3 device 

* commit 'f05e50eb':
  Camera: only return static metadata for HAL3 device
parents e0bd5368 f05e50eb

services/camera/libcameraservice/CameraService.cpp

+6 −0
Original line number Diff line number Diff line
@@ -255,6 +255,12 @@ status_t CameraService::getCameraCharacteristics(int cameraId, 
        return BAD_VALUE;

    }



    if (getDeviceVersion(cameraId, &facing) <= CAMERA_DEVICE_API_VERSION_2_1) {

        // Disable HAL2.x support for camera2 API for now.

        ALOGW("%s: HAL2.x doesn't support getCameraCharacteristics for now", __FUNCTION__);

        return BAD_VALUE;

    }



    struct camera_info info;

    status_t ret = mModule->get_camera_info(cameraId, &info);

    *cameraInfo = info.static_camera_characteristics;