Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 584e277b authored Dec 06, 2023 by Yifan Hong Committed by Automerger Merge Worker Dec 06, 2023

Merge "Revert "lshal: do not pthread_kill"" into main am: ef2e1643

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

Change-Id: I92ab4dde66a947d67bba2347df9e644e088a5816
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents fee02e7d ef2e1643

cmds/lshal/Timeout.h

+3 −7

Original line number	Original line	Diff line number	Diff line
	@@ -72,14 +72,10 @@ bool timeout(std::chrono::duration<R, P> delay, std::function<void(void)> &&func
	return false;		return false;
	}		}
	bool success = state.wait(now + delay);		bool success = state.wait(now + delay);
	if (success) {		if (!success) {
	pthread_join(thread, nullptr);		pthread_kill(thread, SIGINT);
	} else {
	// b/311143089: Abandon this background thread. Resources for a detached
	// thread are cleaned up when it is terminated. If the background thread
	// is stalled, it will be terminated when returning from main().
	pthread_detach(thread);
	}		}
			pthread_join(thread, nullptr);
	return success;		return success;
	}		}

cmds/lshal/main.cpp

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -18,6 +18,5 @@

	int main(int argc, char **argv) {		int main(int argc, char **argv) {
	using namespace ::android::lshal;		using namespace ::android::lshal;
	// Background pthreads from timeout() are destroyed upon returning from main().
	return Lshal{}.main(Arg{argc, argv});		return Lshal{}.main(Arg{argc, argv});
	}		}