Merge "SurfaceFLinger: rename outLayerId" (8c216cf4) · Commits · e / os / platform_frameworks_native

libs/gui/ISurfaceComposerClient.cpp

+7 −7

Original line number	Diff line number	Diff line
		@@ -49,13 +49,13 @@ public:

		status_t createSurface(const String8& name, uint32_t width, uint32_t height, PixelFormat format,
		uint32_t flags, const sp<IBinder>& parent, LayerMetadata metadata,
		sp<IBinder>* handle, sp<IGraphicBufferProducer>* gbp, int32_t* outId,
		uint32_t* outTransformHint) override {
		sp<IBinder>* handle, sp<IGraphicBufferProducer>* gbp,
		int32_t* outLayerId, uint32_t* outTransformHint) override {
		return callRemote<decltype(&ISurfaceComposerClient::createSurface)>(Tag::CREATE_SURFACE,
		name, width, height,
		format, flags, parent,
		std::move(metadata),
		handle, gbp, outId,
		handle, gbp, outLayerId,
		outTransformHint);
		}

		@@ -63,14 +63,14 @@ public:
		PixelFormat format, uint32_t flags,
		const sp<IGraphicBufferProducer>& parent,
		LayerMetadata metadata, sp<IBinder>* handle,
		sp<IGraphicBufferProducer>* gbp, int32_t* outId,
		sp<IGraphicBufferProducer>* gbp, int32_t* outLayerId,
		uint32_t* outTransformHint) override {
		return callRemote<decltype(
		&ISurfaceComposerClient::createWithSurfaceParent)>(Tag::CREATE_WITH_SURFACE_PARENT,
		name, width, height, format,
		flags, parent,
		std::move(metadata), handle, gbp,
		outId, outTransformHint);
		outLayerId, outTransformHint);
		}

		status_t clearLayerFrameStats(const sp<IBinder>& handle) const override {
		@@ -86,10 +86,10 @@ public:
		}

		status_t mirrorSurface(const sp<IBinder>& mirrorFromHandle, sp<IBinder>* outHandle,
		int32_t* outId) override {
		int32_t* outLayerId) override {
		return callRemote<decltype(&ISurfaceComposerClient::mirrorSurface)>(Tag::MIRROR_SURFACE,
		mirrorFromHandle,
		outHandle, outId);
		outHandle, outLayerId);
		}
		};

libs/gui/include/gui/ISurfaceComposerClient.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -58,7 +58,7 @@ public:
		virtual status_t createSurface(const String8& name, uint32_t w, uint32_t h, PixelFormat format,
		uint32_t flags, const sp<IBinder>& parent,
		LayerMetadata metadata, sp<IBinder>* handle,
		sp<IGraphicBufferProducer>* gbp, int32_t* outId,
		sp<IGraphicBufferProducer>* gbp, int32_t* outLayerId,
		uint32_t* outTransformHint) = 0;

		/*
		@@ -68,7 +68,7 @@ public:
		PixelFormat format, uint32_t flags,
		const sp<IGraphicBufferProducer>& parent,
		LayerMetadata metadata, sp<IBinder>* handle,
		sp<IGraphicBufferProducer>* gbp, int32_t* outId,
		sp<IGraphicBufferProducer>* gbp, int32_t* outLayerId,
		uint32_t* outTransformHint) = 0;

		/*
		@@ -82,7 +82,7 @@ public:
		virtual status_t getLayerFrameStats(const sp<IBinder>& handle, FrameStats* outStats) const = 0;

		virtual status_t mirrorSurface(const sp<IBinder>& mirrorFromHandle, sp<IBinder>* outHandle,
		int32_t* outId) = 0;
		int32_t* outLayerId) = 0;
		};

		class BnSurfaceComposerClient : public SafeBnInterface<ISurfaceComposerClient> {

services/surfaceflinger/Client.cpp

+6 −6

Original line number	Diff line number	Diff line
		@@ -79,18 +79,18 @@ sp<Layer> Client::getLayerUser(const sp<IBinder>& handle) const
		status_t Client::createSurface(const String8& name, uint32_t w, uint32_t h, PixelFormat format,
		uint32_t flags, const sp<IBinder>& parentHandle,
		LayerMetadata metadata, sp<IBinder>* handle,
		sp<IGraphicBufferProducer>* gbp, int32_t* outId,
		sp<IGraphicBufferProducer>* gbp, int32_t* outLayerId,
		uint32_t* outTransformHint) {
		// We rely on createLayer to check permissions.
		return mFlinger->createLayer(name, this, w, h, format, flags, std::move(metadata), handle, gbp,
		parentHandle, nullptr, outId, outTransformHint);
		parentHandle, outLayerId, nullptr, outTransformHint);
		}

		status_t Client::createWithSurfaceParent(const String8& name, uint32_t w, uint32_t h,
		PixelFormat format, uint32_t flags,
		const sp<IGraphicBufferProducer>& parent,
		LayerMetadata metadata, sp<IBinder>* handle,
		sp<IGraphicBufferProducer>* gbp, int32_t* outId,
		sp<IGraphicBufferProducer>* gbp, int32_t* outLayerId,
		uint32_t* outTransformHint) {
		if (mFlinger->authenticateSurfaceTexture(parent) == false) {
		ALOGE("failed to authenticate surface texture");
		@@ -104,12 +104,12 @@ status_t Client::createWithSurfaceParent(const String8& name, uint32_t w, uint32
		}

		return mFlinger->createLayer(name, this, w, h, format, flags, std::move(metadata), handle, gbp,
		nullptr, layer, outId, outTransformHint);
		nullptr, outLayerId, layer, outTransformHint);
		}

		status_t Client::mirrorSurface(const sp<IBinder>& mirrorFromHandle, sp<IBinder>* outHandle,
		int32_t* outId) {
		return mFlinger->mirrorLayer(this, mirrorFromHandle, outHandle, outId);
		int32_t* outLayerId) {
		return mFlinger->mirrorLayer(this, mirrorFromHandle, outHandle, outLayerId);
		}

		status_t Client::clearLayerFrameStats(const sp<IBinder>& handle) const {

services/surfaceflinger/Client.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -50,18 +50,18 @@ private:
		virtual status_t createSurface(const String8& name, uint32_t w, uint32_t h, PixelFormat format,
		uint32_t flags, const sp<IBinder>& parent,
		LayerMetadata metadata, sp<IBinder>* handle,
		sp<IGraphicBufferProducer>* gbp, int32_t* outId,
		sp<IGraphicBufferProducer>* gbp, int32_t* outLayerId,
		uint32_t* outTransformHint = nullptr);

		virtual status_t createWithSurfaceParent(const String8& name, uint32_t w, uint32_t h,
		PixelFormat format, uint32_t flags,
		const sp<IGraphicBufferProducer>& parent,
		LayerMetadata metadata, sp<IBinder>* handle,
		sp<IGraphicBufferProducer>* gbp, int32_t* outId,
		sp<IGraphicBufferProducer>* gbp, int32_t* outLayerId,
		uint32_t* outTransformHint = nullptr);

		status_t mirrorSurface(const sp<IBinder>& mirrorFromHandle, sp<IBinder>* handle,
		int32_t* outId);
		int32_t* outLayerId);

		virtual status_t clearLayerFrameStats(const sp<IBinder>& handle) const;

services/surfaceflinger/RefreshRateOverlay.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -176,12 +176,13 @@ RefreshRateOverlay::RefreshRateOverlay(SurfaceFlinger& flinger, bool showSpinner
		}

		bool RefreshRateOverlay::createLayer() {
		int32_t layerId;
		const status_t ret =
		mFlinger.createLayer(String8("RefreshRateOverlay"), mClient,
		SevenSegmentDrawer::getWidth(), SevenSegmentDrawer::getHeight(),
		PIXEL_FORMAT_RGBA_8888,
		ISurfaceComposerClient::eFXSurfaceBufferState, LayerMetadata(),
		&mIBinder, &mGbp, nullptr);
		&mIBinder, &mGbp, nullptr, &layerId);
		if (ret) {
		ALOGE("failed to create buffer state layer");
		return false;