ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Lengthen ScopedDisableMallocTimeout timeout to 10 seconds"

Browse source
This commit is contained in:
Treehugger Robot 2019-09-19 02:14:19 +00:00 • committed by Gerrit Code Review
commit 08c4133c91
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libmemunreachable/ScopedDisableMalloc.h
View file

@ -34,8 +34,8 @@ class DisableMallocGuard {
void Disable() {
if (!disabled_) {
malloc_disable();
disabled_ = true;
malloc_disable();
}
}
@ -71,8 +71,7 @@ class ScopedDisableMalloc {
class ScopedDisableMallocTimeout {
public:
explicit ScopedDisableMallocTimeout(
std::chrono::milliseconds timeout = std::chrono::milliseconds(2000))
explicit ScopedDisableMallocTimeout(std::chrono::milliseconds timeout = std::chrono::seconds(10))
: timeout_(timeout), timed_out_(false), disable_malloc_() {
Disable();
}