commit f3ab568e14f9c65de51870feba2d4d32ee7e5b92
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jun 13 16:24:22 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 13 16:24:22 2018 +0000
tree 114f158878278e218db40fe2e6543057042c01d2
parent 100b09ef8db5e36861046cbd7e394c81b385f08d
parent f770fccebb7fd4ef295a626ba0cfedc68f199c73

Merge "Winscope: Prevent layers trace from capturing entries once its disabled"

services/surfaceflinger/SurfaceTracing.cpp

diff --git a/services/surfaceflinger/SurfaceTracing.cpp b/services/surfaceflinger/SurfaceTracing.cpp
index f8c466e..0e9b04e 100644
--- a/services/surfaceflinger/SurfaceTracing.cpp
+++ b/services/surfaceflinger/SurfaceTracing.cpp
@@ -58,7 +58,9 @@
 
 void SurfaceTracing::traceLayers(const char* where, LayersProto layers) {
     std::lock_guard<std::mutex> protoGuard(mTraceMutex);
-
+    if (!mEnabled) {
+        return;
+    }
     LayersTraceProto* entry = mTrace.add_entry();
     entry->set_elapsed_realtime_nanos(elapsedRealtimeNano());
     entry->set_where(where);