summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Lloyd Pique <lpique@google.com> 2019-08-13 13:23:03 -0700
committer Lloyd Pique <lpique@google.com> 2019-08-13 13:23:03 -0700
commit2eb71ebc30db3c0eca8831a4e65b316245664e1e (patch)
treee0c51edb11fdecedb2e8a4a66d15ac3af8324f4d
parent70954fd00d57e81bf53a45c057ef053681671c3d (diff)
SF: Fix a scheduler related mock leak
After a recent change to inject mocks for use in the scheduler, it turns out the mocks were being leaked, and the test was complaining about such. However `atest libsurfaceflinger_unittest` hides those messages. If you run the test directly, it complains "ERROR: 276 leaked mock objects found at program exit." with a bunch more information about which ones, and which tests were the source. Its a one line change to fix the leak in all tests. This patch does so. Test: libsurfaceflinger_unittest Bug: None Change-Id: Ifb4969c16dcf17a7c55777a3a3e3896273cab68f
-rw-r--r--services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h b/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h
index 97fafcba78..27a119b604 100644
--- a/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h
+++ b/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h
@@ -368,6 +368,7 @@ public:
mutableDrawingState().displays.clear();
mutableEventQueue().reset();
mutableInterceptor().reset();
+ mFlinger->mScheduler.reset();
mFlinger->mCompositionEngine->setHwComposer(std::unique_ptr<HWComposer>());
mFlinger->mCompositionEngine->setRenderEngine(
std::unique_ptr<renderengine::RenderEngine>());