Snap for 5447940 from 93822a0508dfc42936314f50536c9813cfa5f3fd to qt-release (0bfaed36) · Commits · e / os / android_frameworks_native

libs/gui/BufferQueueConsumer.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -190,6 +190,7 @@ status_t BufferQueueConsumer::acquireBuffer(BufferItem* outBuffer,
		desiredPresent - expectedPresent,
		systemTime(CLOCK_MONOTONIC),
		front->mFrameNumber, maxFrameNumber);
		ATRACE_NAME("PRESENT_LATER");
		return PRESENT_LATER;
		}

libs/gui/ISurfaceComposer.cpp

+10 −4

Original line number	Diff line number	Diff line
		@@ -109,7 +109,7 @@ public:
		}

		virtual status_t captureScreen(const sp<IBinder>& display, sp<GraphicBuffer>* outBuffer,
		const ui::Dataspace reqDataspace,
		bool& outCapturedSecureLayers, const ui::Dataspace reqDataspace,
		const ui::PixelFormat reqPixelFormat, Rect sourceCrop,
		uint32_t reqWidth, uint32_t reqHeight, bool useIdentityTransform,
		ISurfaceComposer::Rotation rotation, bool captureSecureLayers) {
		@@ -137,6 +137,7 @@ public:

		*outBuffer = new GraphicBuffer();
		reply.read(**outBuffer);
		outCapturedSecureLayers = reply.readBool();

		return result;
		}
		@@ -1027,12 +1028,17 @@ status_t BnSurfaceComposer::onTransact(
		int32_t rotation = data.readInt32();
		bool captureSecureLayers = static_cast<bool>(data.readInt32());

		status_t res = captureScreen(display, &outBuffer, reqDataspace, reqPixelFormat,
		sourceCrop, reqWidth, reqHeight, useIdentityTransform,
		static_cast<ISurfaceComposer::Rotation>(rotation), captureSecureLayers);
		bool capturedSecureLayers = false;
		status_t res = captureScreen(display, &outBuffer, capturedSecureLayers, reqDataspace,
		reqPixelFormat, sourceCrop, reqWidth, reqHeight,
		useIdentityTransform,
		static_cast<ISurfaceComposer::Rotation>(rotation),
		captureSecureLayers);

		reply->writeInt32(res);
		if (res == NO_ERROR) {
		reply->write(*outBuffer);
		reply->writeBool(capturedSecureLayers);
		}
		return NO_ERROR;
		}

libs/gui/SurfaceComposerClient.cpp

+10 −7

Original line number	Diff line number	Diff line
		@@ -1542,11 +1542,13 @@ status_t SurfaceComposerClient::setDisplayBrightness(const sp<IBinder>& displayT
		status_t ScreenshotClient::capture(const sp<IBinder>& display, const ui::Dataspace reqDataSpace,
		const ui::PixelFormat reqPixelFormat, Rect sourceCrop,
		uint32_t reqWidth, uint32_t reqHeight, bool useIdentityTransform,
		uint32_t rotation, bool captureSecureLayers, sp<GraphicBuffer>* outBuffer) {
		uint32_t rotation, bool captureSecureLayers,
		sp<GraphicBuffer>* outBuffer, bool& outCapturedSecureLayers) {
		sp<ISurfaceComposer> s(ComposerService::getComposerService());
		if (s == nullptr) return NO_INIT;
		status_t ret = s->captureScreen(display, outBuffer, reqDataSpace, reqPixelFormat, sourceCrop,
		reqWidth, reqHeight, useIdentityTransform,
		status_t ret =
		s->captureScreen(display, outBuffer, outCapturedSecureLayers, reqDataSpace,
		reqPixelFormat, sourceCrop, reqWidth, reqHeight, useIdentityTransform,
		static_cast<ISurfaceComposer::Rotation>(rotation),
		captureSecureLayers);
		if (ret != NO_ERROR) {
		@@ -1559,8 +1561,9 @@ status_t ScreenshotClient::capture(const sp<IBinder>& display, const ui::Dataspa
		const ui::PixelFormat reqPixelFormat, Rect sourceCrop,
		uint32_t reqWidth, uint32_t reqHeight, bool useIdentityTransform,
		uint32_t rotation, sp<GraphicBuffer>* outBuffer) {
		return capture(display, reqDataSpace, reqPixelFormat, sourceCrop, reqWidth,
		reqHeight, useIdentityTransform, rotation, false, outBuffer);
		bool ignored;
		return capture(display, reqDataSpace, reqPixelFormat, sourceCrop, reqWidth, reqHeight,
		useIdentityTransform, rotation, false, outBuffer, ignored);
		}

		status_t ScreenshotClient::captureLayers(const sp<IBinder>& layerHandle,

libs/gui/include/gui/ISurfaceComposer.h

+5 −3

Original line number	Diff line number	Diff line
		@@ -212,7 +212,7 @@ public:
		* it) around its center.
		*/
		virtual status_t captureScreen(const sp<IBinder>& display, sp<GraphicBuffer>* outBuffer,
		const ui::Dataspace reqDataspace,
		bool& outCapturedSecureLayers, const ui::Dataspace reqDataspace,
		const ui::PixelFormat reqPixelFormat, Rect sourceCrop,
		uint32_t reqWidth, uint32_t reqHeight, bool useIdentityTransform,
		Rotation rotation = eRotateNone,
		@@ -241,8 +241,10 @@ public:
		virtual status_t captureScreen(const sp<IBinder>& display, sp<GraphicBuffer>* outBuffer,
		Rect sourceCrop, uint32_t reqWidth, uint32_t reqHeight,
		bool useIdentityTransform, Rotation rotation = eRotateNone) {
		return captureScreen(display, outBuffer, ui::Dataspace::V0_SRGB, ui::PixelFormat::RGBA_8888,
		sourceCrop, reqWidth, reqHeight, useIdentityTransform, rotation);
		bool outIgnored;
		return captureScreen(display, outBuffer, outIgnored, ui::Dataspace::V0_SRGB,
		ui::PixelFormat::RGBA_8888, sourceCrop, reqWidth, reqHeight,
		useIdentityTransform, rotation);
		}

		template <class AA>

libs/gui/include/gui/SurfaceComposerClient.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -509,7 +509,8 @@ public:
		static status_t capture(const sp<IBinder>& display, const ui::Dataspace reqDataSpace,
		const ui::PixelFormat reqPixelFormat, Rect sourceCrop,
		uint32_t reqWidth, uint32_t reqHeight, bool useIdentityTransform,
		uint32_t rotation, bool captureSecureLayers, sp<GraphicBuffer>* outBuffer);
		uint32_t rotation, bool captureSecureLayers,
		sp<GraphicBuffer>* outBuffer, bool& outCapturedSecureLayers);
		static status_t capture(const sp<IBinder>& display, const ui::Dataspace reqDataSpace,
		const ui::PixelFormat reqPixelFormat, Rect sourceCrop,
		uint32_t reqWidth, uint32_t reqHeight, bool useIdentityTransform,