From 2eb71ebc30db3c0eca8831a4e65b316245664e1e Mon Sep 17 00:00:00 2001 From: Lloyd Pique Date: Tue, 13 Aug 2019 13:23:03 -0700 Subject: 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 --- services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h | 1 + 1 file changed, 1 insertion(+) 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()); mFlinger->mCompositionEngine->setRenderEngine( std::unique_ptr()); -- cgit v1.2.3-59-g8ed1b