Merge "Lengthen ScopedDisableMallocTimeout timeout to 10 seconds" am: 08c4133c91 (48f88f67) · Commits · e / os / android_system_core

libmemunreachable/ScopedDisableMalloc.h

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -34,8 +34,8 @@ class DisableMallocGuard {

	void Disable() {		void Disable() {
	if (!disabled_) {		if (!disabled_) {
	malloc_disable();
	disabled_ = true;		disabled_ = true;
			malloc_disable();
	}		}
	}		}

	@@ -71,8 +71,7 @@ class ScopedDisableMalloc {

	class ScopedDisableMallocTimeout {		class ScopedDisableMallocTimeout {
	public:		public:
	explicit ScopedDisableMallocTimeout(		explicit ScopedDisableMallocTimeout(std::chrono::milliseconds timeout = std::chrono::seconds(10))
	std::chrono::milliseconds timeout = std::chrono::milliseconds(2000))
	: timeout_(timeout), timed_out_(false), disable_malloc_() {		: timeout_(timeout), timed_out_(false), disable_malloc_() {
	Disable();		Disable();
	}		}