Merge "Fix race condition when enabling vr flinger" (87c05e00) · Commits · e / os / android_frameworks_native-old

libs/vr/libvrflinger/hardware_composer.cpp

+5 −5

Original line number	Diff line number	Diff line
		@@ -191,6 +191,11 @@ void HardwareComposer::Enable() {

		void HardwareComposer::Disable() {
		UpdatePostThreadState(PostThreadState::Suspended, true);

		std::unique_lock<std::mutex> lock(post_thread_mutex_);
		post_thread_ready_.wait(lock, [this] {
		return !post_thread_resumed_;
		});
		}

		void HardwareComposer::OnBootFinished() {
		@@ -232,11 +237,6 @@ void HardwareComposer::UpdatePostThreadState(PostThreadStateType state,
		eventfd_read(post_thread_event_fd_.Get(), &value);
		post_thread_wait_.notify_one();
		}

		// Wait until the post thread is in the requested state.
		post_thread_ready_.wait(lock, [this, effective_suspend] {
		return effective_suspend != post_thread_resumed_;
		});
		}

		void HardwareComposer::OnPostThreadResumed() {