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

Commit 370875f9 authored by Eino-Ville Talvala's avatar Eino-Ville Talvala
Browse files

Camera: Camera3Device: Fix off-by-one error 

These things are ceaseless: /
  code reviews, design docs - /
  off-by-one errors making a mess

Test: atest CtsCameraTestCases
Bug: 129561652

Change-Id: I807d7ad4740ffe267053fe5da2080f9ecb45aa72
parent 0e5a1b3b

services/camera/libcameraservice/device3/Camera3Device.cpp

+3 −2
Original line number Diff line number Diff line
@@ -4278,12 +4278,13 @@ status_t Camera3Device::HalInterface::configureStreams(const camera_metadata_t * 
        // Start scan at i, with the assumption that the stream order matches

        size_t realIdx = i;

        bool found = false;

        for (size_t idx = 0; idx < finalConfiguration.streams.size(); idx++) {

        size_t halStreamCount = finalConfiguration.streams.size();

        for (size_t idx = 0; idx < halStreamCount; idx++) {

            if (finalConfiguration.streams[realIdx].v3_2.id == streamId) {

                found = true;

                break;

            }

            realIdx = (realIdx >= finalConfiguration.streams.size()) ? 0 : realIdx + 1;

            realIdx = (realIdx >= halStreamCount - 1) ? 0 : realIdx + 1;

        }

        if (!found) {

            ALOGE("%s: Stream %d not found in stream configuration response from HAL",