Commit 650484d2 authored Sep 28, 2021 by Steven Moreland Committed by Automerger Merge Worker Sep 28, 2021

Merge "libbinder: RPC avoid FdTrigger shutdown race" am: 13ba6f3c am: f2e316ac

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1838242

Change-Id: Ic6c49b7c7e5378da559dba4375ea7418973a8694

libs/binder/RpcServer.cpp

+3 −0

Original line number	Diff line number	Diff line
		@@ -205,8 +205,11 @@ bool RpcServer::shutdown() {
		}

		mShutdownTrigger->trigger();

		for (auto& [id, session] : mSessions) {
		(void)id;
		// server lock is a more general lock
		std::lock_guard<std::mutex> _lSession(session->mMutex);
		session->mShutdownTrigger->trigger();
		}