commit 542c9dc008516bdce10d748e4ccda732ec7b511c
author Dominik Laskowski <domlaskowski@google.com> Fri Apr 10 12:42:02 2020 -0700
committer Dominik Laskowski <domlaskowski@google.com> Mon Apr 13 22:15:15 2020 -0700
tree a4ebaa97e86fdd670ca6aad9501cf349f30b6cbf
parent 470df5f0d6a272fd0c92f5967e43af0f29a5c866

SF: Remove display lookup in SurfaceTracing

Remove the strong reference to prevent a removed display from being
destroyed off the main thread. This is also a step in adding thread
annotations to display state accessors.

Also, clean up SurfaceTracing usage in the SurfaceFlinger class.

Bug: 123715322
Test: Tracing still works.
Change-Id: Iad174e7b42fbde96a46155c740838f6cd3966365

services/surfaceflinger/SurfaceTracing.h

diff --git a/services/surfaceflinger/SurfaceTracing.h b/services/surfaceflinger/SurfaceTracing.h
index e90fc4d..f208eb8 100644
--- a/services/surfaceflinger/SurfaceTracing.h
+++ b/services/surfaceflinger/SurfaceTracing.h
@@ -27,8 +27,6 @@
 #include <queue>
 #include <thread>
 
-#include "DisplayDevice.h"
-
 using namespace android::surfaceflinger;
 
 namespace android {
@@ -44,7 +42,7 @@
 class SurfaceTracing {
 public:
     explicit SurfaceTracing(SurfaceFlinger& flinger);
-    void enable();
+    bool enable();
     bool disable();
     status_t writeToFile();
     bool isEnabled() const;
@@ -92,9 +90,7 @@
     void mainLoop();
     bool addFirstEntry();
     LayersTraceProto traceWhenNotified();
-    LayersTraceProto traceLayersLocked(const char* where,
-                                       const sp<const DisplayDevice>& displayDevice)
-            REQUIRES(mSfLock);
+    LayersTraceProto traceLayersLocked(const char* where) REQUIRES(mSfLock);
 
     // Returns true if trace is enabled.
     bool addTraceToBuffer(LayersTraceProto& entry);