[SurfaceFlinger] Resolve deadlock in SurfaceTracing.
SurfaceTracing cannot acquire mStateLock while mDrawingStateLock is
held. SurfaceTracing only needs to acquire mStateLock for getting the
default DisplayDevice for getting a layer's HWC composition type. As a
workaround, grab the DisplayDevice ahead of time.
Bug: 151108871
Test: builds
Change-Id: I84a76694e9890242c666ec5e3eb04d4114f8240a
diff --git a/services/surfaceflinger/SurfaceFlinger.h b/services/surfaceflinger/SurfaceFlinger.h
index e6b91e6..ba265ad 100644
--- a/services/surfaceflinger/SurfaceFlinger.h
+++ b/services/surfaceflinger/SurfaceFlinger.h
@@ -923,7 +923,8 @@
void dumpDisplayIdentificationData(std::string& result) const;
void dumpRawDisplayIdentificationData(const DumpArgs&, std::string& result) const;
void dumpWideColorInfo(std::string& result) const;
- LayersProto dumpDrawingStateProto(uint32_t traceFlags = SurfaceTracing::TRACE_ALL) const;
+ LayersProto dumpDrawingStateProto(uint32_t traceFlags = SurfaceTracing::TRACE_ALL,
+ const sp<const DisplayDevice>& displayDevice = nullptr) const;
void dumpOffscreenLayersProto(LayersProto& layersProto,
uint32_t traceFlags = SurfaceTracing::TRACE_ALL) const;
// Dumps state from HW Composer