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

Commit 701647f4 authored by Emilian Peev's avatar Emilian Peev Committed by android-build-merger
Browse files

Merge "Camera: Ignore buffer handle 'int' section" into oc-dev am: a8939b60 

am: 71432b14

Change-Id: Id4b202c236cc6c56fd1da3e6b0c5b99d82cb1d46
parents 33d94a21 71432b14

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;

                        }