Merge "Camera: Redirect dump to "/dev/null" instead of stdout" (2f041c08) · Commits · e / os / android_hardware_interfaces

camera/provider/2.4/vts/functional/VtsHalCameraProviderV2_4TargetTest.cpp

+7 −2

Original line number	Diff line number	Diff line
		@@ -66,6 +66,7 @@ using ::android::hardware::camera::device::V3_2::StreamBuffer;
		#define MAX_VIDEO_WIDTH 4096
		#define MAX_VIDEO_HEIGHT 2160
		#define STREAM_BUFFER_TIMEOUT 3 // sec.
		#define DUMP_OUTPUT "/dev/null"

		struct AvailableStream {
		int32_t width;
		@@ -462,9 +463,11 @@ TEST_F(CameraHidlTest, dumpState) {
		});

		native_handle_t* raw_handle = native_handle_create(1, 0);
		raw_handle->data[0] = 1; // std out
		raw_handle->data[0] = open(DUMP_OUTPUT, O_RDWR);
		ASSERT_GE(raw_handle->data[0], 0);
		hidl_handle handle = raw_handle;
		device3_2->dumpState(handle);
		close(raw_handle->data[0]);
		native_handle_delete(raw_handle);
		}
		}
		@@ -500,9 +503,11 @@ TEST_F(CameraHidlTest, openClose) {
		});

		native_handle_t* raw_handle = native_handle_create(1, 0);
		raw_handle->data[0] = 1; // std out
		raw_handle->data[0] = open(DUMP_OUTPUT, O_RDWR);
		ASSERT_GE(raw_handle->data[0], 0);
		hidl_handle handle = raw_handle;
		device3_2->dumpState(handle);
		close(raw_handle->data[0]);
		native_handle_delete(raw_handle);

		session->close();