Use MockFrameTracer in unit tests
This change makes sure that MockFrameTracer is used in unittests
wherever FrameTracer logic is embedded in (mainly in
TestableSurfaceFlinger). This is to avoid double initialization of
tracing, that causes undesirable effects that are hard to debug.
Bug: 173636249
Test: libsurfaceflinger_unittest (without filter. Test the whole suite)
Change-Id: Iffa0696acde091ed4ebd300ac950544925824bea
diff --git a/services/surfaceflinger/SurfaceFlingerDefaultFactory.cpp b/services/surfaceflinger/SurfaceFlingerDefaultFactory.cpp
index 9a8deae..a93f5f6 100644
--- a/services/surfaceflinger/SurfaceFlingerDefaultFactory.cpp
+++ b/services/surfaceflinger/SurfaceFlingerDefaultFactory.cpp
@@ -28,6 +28,7 @@
#include "ContainerLayer.h"
#include "DisplayDevice.h"
#include "EffectLayer.h"
+#include "FrameTracer/FrameTracer.h"
#include "Layer.h"
#include "MonitoredProducer.h"
#include "NativeWindowSurface.h"
@@ -130,6 +131,9 @@
return new EffectLayer(args);
}
+std::unique_ptr<FrameTracer> DefaultFactory::createFrameTracer() {
+ return std::make_unique<FrameTracer>();
+}
} // namespace android::surfaceflinger
// TODO(b/129481165): remove the #pragma below and fix conversion issues