commit ef974d6c92e59596605cc831d93e2e76f64b6d20
author Courtney Goeltzenleuchter <courtneygo@google.com> Sat Aug 05 04:10:29 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Aug 05 04:10:29 2017 +0000
tree 88904fdb74d838545cf5088c93a2f7fb9f45fb95
parent f678bb45a480a857721378ea6165ce6a4b6d14d9
parent 0632b778331dfc46979b8865fdd530e61d5bdef9

Merge "Fix build error from diamond merge" into oc-mr1-dev
am: 0632b77833

Change-Id: I9c8658bddd0b9c1e49f9ce5f6477bcf59db07c82

services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp

diff --git a/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp b/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp
index 68d7a18..1ac21c6 100644
--- a/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp
+++ b/services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp
@@ -173,16 +173,17 @@
     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;
     }
+#else
+    outBuffer = mCurrentBuffer;
+#endif
 
-    return result;
+    return NO_ERROR;
 }
 
 #ifndef USE_HWC2