Snap for 10338099 from 25d40250659b36c727b8cab47b4f29d57b213b5d to udc-release (3664193b) · Commits · e / os / android_hardware_interfaces

automotive/evs/1.0/vts/functional/FrameHandler.cpp

+8 −4

Original line number	Diff line number	Diff line
		@@ -133,6 +133,9 @@ Return<void> FrameHandler::deliverFrame(const BufferDesc& bufferArg) {
		// Local flag we use to keep track of when the stream is stopping
		bool timeToStop = false;

		// Another local flag telling whether or not current frame is displayed.
		bool frameDisplayed = false;

		if (bufferArg.memHandle.getNativeHandle() == nullptr) {
		// Signal that the last frame has been received and the stream is stopped
		timeToStop = true;
		@@ -172,9 +175,7 @@ Return<void> FrameHandler::deliverFrame(const BufferDesc& bufferArg) {
		} else {
		// Everything looks good!
		// Keep track so tests or watch dogs can monitor progress
		mLock.lock();
		mFramesDisplayed++;
		mLock.unlock();
		frameDisplayed = true;
		}
		}
		}
		@@ -197,12 +198,15 @@ Return<void> FrameHandler::deliverFrame(const BufferDesc& bufferArg) {
		}


		// Update our received frame count and notify anybody who cares that things have changed
		// Update frame counters and notify anybody who cares that things have changed.
		mLock.lock();
		if (timeToStop) {
		mRunning = false;
		} else {
		mFramesReceived++;
		if (frameDisplayed) {
		mFramesDisplayed++;
		}
		}
		mLock.unlock();
		mSignal.notify_all();

+9 −3

Original line number	Diff line number	Diff line
		@@ -385,10 +385,16 @@ TEST_P(ContextHubAidl, TestInvalidHostConnection) {
		TEST_P(ContextHubAidl, TestNanSessionStateChange) {
		NanSessionStateUpdate update;
		update.state = true;
		ASSERT_TRUE(contextHub->onNanSessionStateChanged(update).isOk());
		Status status = contextHub->onNanSessionStateChanged(update);
		if (status.exceptionCode() == Status::EX_UNSUPPORTED_OPERATION \|\|
		status.transactionError() == android::UNKNOWN_TRANSACTION) {
		GTEST_SKIP() << "Not supported -> old API; or not implemented";
		} else {
		ASSERT_TRUE(status.isOk());
		update.state = false;
		ASSERT_TRUE(contextHub->onNanSessionStateChanged(update).isOk());
		}
		}

		std::string PrintGeneratedTest(const testing::TestParamInfo<ContextHubAidl::ParamType>& info) {
		return std::string("CONTEXT_HUB_ID_") + std::to_string(std::get<1>(info.param));