commit 2b727ac817c79d1e7342fb364d4b1d0512b5060d
author David Sodman <dsodman@google.com> Thu Dec 21 14:28:08 2017 -0800
committer David Sodman <dsodman@google.com> Sat Mar 17 13:22:51 2018 -0700
tree 10bda98f415935ec6215968c376ebd936598017c
parent 303407fcc3a3d152d055b688c137815021030da2

SF: Add LayerName to CompositionInfo

Add layerName to CompositionInfo for tracking/debug purposes

Test: Compile
Merged-Id: I445a32f2a095dae435581888171a46082880c1e4
Change-Id: I445a32f2a095dae435581888171a46082880c1e4

services/surfaceflinger/Layer.cpp

diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index e503955..ba2d0a0 100644
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -92,7 +92,7 @@
         mLastFrameNumberReceived(0),
         mAutoRefresh(false),
         mFreezeGeometryUpdates(false),
-        mBE{this} {
+        mBE{this, name.string()} {
 
     mCurrentCrop.makeInvalid();
 

services/surfaceflinger/LayerBE.cpp

diff --git a/services/surfaceflinger/LayerBE.cpp b/services/surfaceflinger/LayerBE.cpp
index 22e38aa..5287fe1 100644
--- a/services/surfaceflinger/LayerBE.cpp
+++ b/services/surfaceflinger/LayerBE.cpp
@@ -23,10 +23,11 @@
 
 namespace android {
 
-LayerBE::LayerBE(Layer* layer)
+LayerBE::LayerBE(Layer* layer, std::string layerName)
       : mLayer(layer),
         mMesh(Mesh::TRIANGLE_FAN, 4, 2, 2) {
     compositionInfo.layer = this;
+    compositionInfo.layerName = layerName;
 }
 
 void LayerBE::onLayerDisplayed(const sp<Fence>& releaseFence) {

services/surfaceflinger/LayerBE.h

diff --git a/services/surfaceflinger/LayerBE.h b/services/surfaceflinger/LayerBE.h
index 75766bf..981f756 100644
--- a/services/surfaceflinger/LayerBE.h
+++ b/services/surfaceflinger/LayerBE.h
@@ -104,7 +104,7 @@
     friend class ColorLayer;
     friend class SurfaceFlinger;
 
-    LayerBE(Layer* layer);
+    LayerBE(Layer* layer, std::string layerName);
 
     void onLayerDisplayed(const sp<Fence>& releaseFence);
     Mesh& getMesh() { return mMesh; }