commit cd939aa6622430482d2c79bb9deefb67d3ee4611
author Courtney Goeltzenleuchter <courtneygo@google.com> Tue Jul 25 10:34:27 2017 -0600
committer Courtney Goeltzenleuchter <courtneygo@google.com> Tue Jul 25 10:38:29 2017 -0600
tree 0b66a52f960b9d87ef4b96ef52bbf3d870e9ad26
parent 79d272442ce13418c3ea81c95d7fea0159b4b481

Fix build for non-HWC2 targets

Fix build error introduced by ag/2528660
Test: lunch mini_x86-userdebug; make

Change-Id: I39b758c6456a6f334479ec4aed97db1659823a8b

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