Snap for 10341497 from 44a34c0f71b1c798e8c7627274b1c54852d489ce to udc-qpr1-release (c342cb0d) · 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();

+0 −5

Original line number	Diff line number	Diff line
		@@ -263,11 +263,6 @@ void FakeFingerprintEngine::enumerateEnrollmentsImpl(ISessionCallback* cb) {
		BEGIN_OP(0);

		std::vector<int32_t> ids;
		// There are some enrollment sync issue with framework, which results in
		// a single template removal during the very firt sync command after reboot.
		// This is a workaround for now. TODO(b/243129174)
		ids.push_back(-1);

		for (auto& enrollment : FingerprintHalProperties::enrollments()) {
		auto id = enrollment.value_or(0);
		if (id > 0) {

+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));

+1 −1

Original line number	Diff line number	Diff line
		@@ -282,7 +282,7 @@ class WifiChipTest : public Test {
		public:
		void SetUp() override {
		chip_ = WifiChip::create(chip_id_, true, legacy_hal_, mode_controller_, iface_util_,
		feature_flags_, subsystemRestartHandler);
		feature_flags_, subsystemRestartHandler, true);

		EXPECT_CALL(*mode_controller_, changeFirmwareMode(testing::_))
		.WillRepeatedly(testing::Return(true));

+1 −1

Original line number	Diff line number	Diff line
		@@ -133,7 +133,7 @@ ndk::ScopedAStatus Wifi::startInternal() {
		chips_.push_back(
		WifiChip::create(chipId, chipId == kPrimaryChipId, hal, mode_controller_,
		std::make_shared<iface_util::WifiIfaceUtil>(iface_tool_, hal),
		feature_flags_, on_subsystem_restart_callback));
		feature_flags_, on_subsystem_restart_callback, false));
		chipId++;
		}
		run_state_ = RunState::STARTED;