commit d30f15c8f8609c9544e08e1280e020dd3e6720ce
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Aug 14 22:34:34 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 14 22:34:34 2019 +0000
tree 34ef397f59328fb656564ccb78fdfaa0123225c1
parent c603c81ddb3cbe76aa4742162151792ac0d52d13
parent 2eb71ebc30db3c0eca8831a4e65b316245664e1e

Merge "SF: Fix a scheduler related mock leak"

services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h

diff --git a/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h b/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h
index 97fafcb..27a119b 100644
--- a/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h
+++ b/services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h
@@ -368,6 +368,7 @@
         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>());