Merge changes If4271719,I9c9b5de9,I46a26a67 into oc-dr1-dev am: ddd9c71272 am: e124f74dff (d0bdfcb2) · Commits · e / os / android_frameworks_native-old

services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp

+7 −1

Original line number	Original line	Diff line number	Diff line
	@@ -183,7 +183,13 @@ status_t FramebufferSurface::nextBuffer(sp<GraphicBuffer>& outBuffer, sp<Fence>&
	#else		#else
	outBuffer = mCurrentBuffer;		outBuffer = mCurrentBuffer;
	#endif		#endif
	return NO_ERROR;		status_t result =
			mHwc.setClientTarget(mDisplayType, outSlot, outFence, outBuffer, outDataspace);
			if (result != NO_ERROR) {
			ALOGE("error posting framebuffer: %d", result);
			}

			return result;
	}		}

	#ifndef USE_HWC2		#ifndef USE_HWC2