Merge changes I23e6f088,I800208e8,I55123a7a into oc-dr1-dev am: 607b5d1b40 (3da6f353) · Commits · e / os / platform_frameworks_native

services/surfaceflinger/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -104,7 +104,7 @@ LOCAL_EXPORT_SHARED_LIBRARY_HEADERS := \
		libhidltransport \
		libhwbinder

		LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code
		LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code -std=c++1z

		include $(BUILD_SHARED_LIBRARY)

+244 −296

File changed.

Preview size limit exceeded, changes collapsed.

+11 −0

Original line number	Diff line number	Diff line
		@@ -417,6 +417,14 @@ private:
		int32_t minLayerZ, int32_t maxLayerZ,
		bool yswap, bool useIdentityTransform, Transform::orientation_flags rotation);

		#ifdef USE_HWC2
		status_t captureScreenImplLocked(const sp<const DisplayDevice>& device,
		ANativeWindowBuffer* buffer, Rect sourceCrop,
		uint32_t reqWidth, uint32_t reqHeight, int32_t minLayerZ,
		int32_t maxLayerZ, bool useIdentityTransform,
		Transform::orientation_flags rotation, bool isLocalScreenshot,
		int* outSyncFd);
		#else
		status_t captureScreenImplLocked(
		const sp<const DisplayDevice>& hw,
		const sp<IGraphicBufferProducer>& producer,
		@@ -424,6 +432,7 @@ private:
		int32_t minLayerZ, int32_t maxLayerZ,
		bool useIdentityTransform, Transform::orientation_flags rotation,
		bool isLocalScreenshot);
		#endif

		sp<StartBootAnimThread> mStartBootAnimThread = nullptr;

		@@ -695,6 +704,8 @@ private:
		};
		std::queue<CompositePresentTime> mCompositePresentTimes;

		std::atomic<bool> mRefreshPending{false};

		/* ------------------------------------------------------------------------
		* Feature prototyping
		*/