commit bf170d93e4a313201c8fe9b7bced685b1395828a
author Dominik Laskowski <domlaskowski@google.com> Thu Apr 19 15:08:05 2018 -0700
committer Dominik Laskowski <domlaskowski@google.com> Wed Apr 25 12:25:50 2018 -0700
tree b42a23fa5d435a9eb6d04fbe03ec420081b64cfa
parent fc2c032b2c1bec0494f1a69497aafa2df4992dc5

SF: Use std::string for display name

Bug: 74619554
Test: Build
Change-Id: Ic07b38516233dda0c275774ccca315b1ac205d47

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 844ba7f..2c95e14 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -2905,7 +2905,7 @@
 
         if (!displayDevice->makeCurrent()) {
             ALOGW("DisplayDevice::makeCurrent failed. Aborting surface composition for display %s",
-                  displayDevice->getDisplayName().string());
+                  displayDevice->getDisplayName().c_str());
             getRenderEngine().resetCurrentSurface();
 
             // |mStateLock| not needed as we are on the main thread