commit 46f28c7b3180e2944ea5553d85c2d534c8fdba00
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jul 25 19:26:54 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 25 19:26:54 2017 +0000
tree 7bcaec0680ee23cfa00e351a56f666c4c749e840
parent 0ffba8d3ea304f66bbcd2a084921fb2b86d7b4a7
parent cd939aa6622430482d2c79bb9deefb67d3ee4611

Merge "Fix build for non-HWC2 targets"

services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp

diff --git a/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp b/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp
index 05e9c2d..ccb0c3b 100644
--- a/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp
+++ b/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp
@@ -174,17 +174,16 @@
 #ifdef USE_HWC2
     mHwcBufferCache.getHwcBuffer(mCurrentBufferSlot, mCurrentBuffer,
             &outSlot, &outBuffer);
-    outDataspace = item.mDataSpace;
-#else
-    outBuffer = mCurrentBuffer;
-#endif
     status_t result =
             mHwc.setClientTarget(mDisplayType, outSlot, outFence, outBuffer, outDataspace);
     if (result != NO_ERROR) {
         ALOGE("error posting framebuffer: %d", result);
+        return result;
     }
-
-    return result;
+#else
+    outBuffer = mCurrentBuffer;
+#endif
+    return NO_ERROR;
 }
 
 #ifndef USE_HWC2