Merge "Camera: Ignore buffer handle 'int' section" into oc-dev (a8939b60) · Commits · e / os / android_frameworks_av

services/camera/libcameraservice/device3/Camera3Device.h

+3 −6

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

	size_t result = 1;		size_t result = 1;
	result = 31 * result + buf->numFds;		result = 31 * result + buf->numFds;
	result = 31 * result + buf->numInts;		for (int i = 0; i < buf->numFds; i++) {
	int length = buf->numFds + buf->numInts;
	for (int i = 0; i < length; i++) {
	result = 31 * result + buf->data[i];		result = 31 * result + buf->data[i];
	}		}
	return result;		return result;
	@@ -305,9 +303,8 @@ class Camera3Device :

	struct BufferComparator {		struct BufferComparator {
	bool operator()(const buffer_handle_t& buf1, const buffer_handle_t& buf2) const {		bool operator()(const buffer_handle_t& buf1, const buffer_handle_t& buf2) const {
	if (buf1->numFds == buf2->numFds && buf1->numInts == buf2->numInts) {		if (buf1->numFds == buf2->numFds) {
	int length = buf1->numFds + buf1->numInts;		for (int i = 0; i < buf1->numFds; i++) {
	for (int i = 0; i < length; i++) {
	if (buf1->data[i] != buf2->data[i]) {		if (buf1->data[i] != buf2->data[i]) {
	return false;		return false;
	}		}