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

Commit c758f227 authored by Igor Murashkin's avatar Igor Murashkin
Browse files

camera: hal3: Remove register_stream setprop check 

camera3_device_t::register_stream must always be NULL in HAL3.2+ cameras

Bug: 13914251
Change-Id: I116ee71135a827c8b4db61cd91f56ba56da3f0ef
parent a858ea04

services/camera/libcameraservice/device3/Camera3Stream.cpp

+1 −12
Original line number Diff line number Diff line
@@ -381,18 +381,7 @@ status_t Camera3Stream::registerBuffersLocked(camera3_device *hal3Device) { 
    if (hal3Device->common.version >= CAMERA_DEVICE_API_VERSION_3_2) {

        ALOGV("%s: register_stream_buffers unused as of HAL3.2", __FUNCTION__);



        /**

         * Skip the NULL check if camera.dev.register_stream is 1.

         *

         * For development-validation purposes only.

         *

         * TODO: Remove the property check before shipping L (b/13914251).

         */

        char value[PROPERTY_VALUE_MAX] = { '\0', };

        property_get("camera.dev.register_stream", value, "0");

        int propInt = atoi(value);



        if (propInt == 0 && hal3Device->ops->register_stream_buffers != NULL) {

        if (hal3Device->ops->register_stream_buffers != NULL) {

            ALOGE("%s: register_stream_buffers is deprecated in HAL3.2; "

                    "must be set to NULL in camera3_device::ops", __FUNCTION__);

            return INVALID_OPERATION;