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

Commit 2a6a4689 authored by Emilian Peev's avatar Emilian Peev
Browse files

Camera: Ignore buffer handle 'int' section 

Bufer handle hashing and comparison currently uses the buffer
'Int' section along with the Fd section. However the values there
can dynamically change after the buffer gets allocated which will
introduce side-effects in the buffer id map.

Bug: 37257356
Test: Complete Camera/Camera2 CTS
Change-Id: I2cf09ced69f155285dae67b3a2502e6b87f7d9cc
parent 5551797e

services/camera/libcameraservice/device3/Camera3Device.h

+3 −6
Original line number Diff line number Diff line
@@ -294,9 +294,7 @@ class Camera3Device : 


                size_t result = 1;

                result = 31 * result + buf->numFds;

                result = 31 * result + buf->numInts;

                int length = buf->numFds + buf->numInts;

                for (int i = 0; i < length; i++) {

                for (int i = 0; i < buf->numFds; i++) {

                    result = 31 * result + buf->data[i];

                }

                return result;
@@ -305,9 +303,8 @@ class Camera3Device : 


        struct BufferComparator {

            bool operator()(const buffer_handle_t& buf1, const buffer_handle_t& buf2) const {

                if (buf1->numFds == buf2->numFds && buf1->numInts == buf2->numInts) {

                    int length = buf1->numFds + buf1->numInts;

                    for (int i = 0; i < length; i++) {

                if (buf1->numFds == buf2->numFds) {

                    for (int i = 0; i < buf1->numFds; i++) {

                        if (buf1->data[i] != buf2->data[i]) {

                            return false;

                        }