From 553ae6ab071b1db5e783c8c02f9311b4969729f6 Mon Sep 17 00:00:00 2001 From: John Reck Date: Mon, 23 Jan 2017 10:46:50 -0800 Subject: [PATCH] Workaround libmemunreachable lockup Bug: 34586922 Test: hwui_unit_tests completes Change-Id: Ia55f7bc49faf8a32624e2f16e2477eb12a261b07 --- libs/hwui/tests/common/LeakChecker.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/hwui/tests/common/LeakChecker.cpp b/libs/hwui/tests/common/LeakChecker.cpp index d935382cc9a42..8a0b64b2f1cb4 100644 --- a/libs/hwui/tests/common/LeakChecker.cpp +++ b/libs/hwui/tests/common/LeakChecker.cpp @@ -67,6 +67,12 @@ static void logUnreachable(initializer_list infolist) { } void LeakChecker::checkForLeaks() { + // TODO: Re-enable, disabled to workaround b/34586922 + if ((true)) { + cout << "checkForLeaks disabled, see b/34586922" << endl; + return; + } + // TODO: Until we can shutdown the RT thread we need to do this in // two passes as GetUnreachableMemory has limited insight into // thread-local caches so some leaks will not be properly tagged as leaks