Merge "Migrate ISurfaceComposerClient to AIDL" (3e811401) · Commits · e / os / platform_frameworks_native

libs/binder/include/binder/IInterface.h

+73 −74

Original line number	Diff line number	Diff line
		@@ -278,7 +278,6 @@ constexpr const char* const kManualInterfaces[] = {
		"android.service.vr.IVrManager",
		"android.service.vr.IVrStateCallbacks",
		"android.ui.ISurfaceComposer",
		"android.ui.ISurfaceComposerClient",
		"android.utils.IMemory",
		"android.utils.IMemoryHeap",
		"com.android.car.procfsinspector.IProcfsInspector",

libs/gui/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -204,7 +204,6 @@ cc_library_shared {
		"IGraphicBufferProducer.cpp",
		"IProducerListener.cpp",
		"ISurfaceComposer.cpp",
		"ISurfaceComposerClient.cpp",
		"ITransactionCompletedListener.cpp",
		"LayerDebugInfo.cpp",
		"LayerMetadata.cpp",

libs/gui/BLASTBufferQueue.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -551,7 +551,7 @@ void BLASTBufferQueue::acquireNextBufferLocked(
		if (dequeueTime != mDequeueTimestamps.end()) {
		Parcel p;
		p.writeInt64(dequeueTime->second);
		t->setMetadata(mSurfaceControl, METADATA_DEQUEUE_TIME, p);
		t->setMetadata(mSurfaceControl, gui::METADATA_DEQUEUE_TIME, p);
		mDequeueTimestamps.erase(dequeueTime);
		}
		}

libs/gui/ISurfaceComposer.cpp

+1 −16

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@
		#include <binder/Parcel.h>
		#include <gui/IGraphicBufferProducer.h>
		#include <gui/ISurfaceComposer.h>
		#include <gui/ISurfaceComposerClient.h>
		#include <gui/LayerState.h>
		#include <private/gui/ParcelUtils.h>
		#include <stdint.h>
		@@ -61,14 +60,6 @@ public:

		virtual ~BpSurfaceComposer();

		virtual sp<ISurfaceComposerClient> createConnection()
		{
		Parcel data, reply;
		data.writeInterfaceToken(ISurfaceComposer::getInterfaceDescriptor());
		remote()->transact(BnSurfaceComposer::CREATE_CONNECTION, data, &reply);
		return interface_cast<ISurfaceComposerClient>(reply.readStrongBinder());
		}

		status_t setTransactionState(const FrameTimelineInfo& frameTimelineInfo,
		const Vector<ComposerState>& state,
		const Vector<DisplayState>& displays, uint32_t flags,
		@@ -160,12 +151,6 @@ status_t BnSurfaceComposer::onTransact(
		uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags)
		{
		switch (code) {
		case CREATE_CONNECTION: {
		CHECK_INTERFACE(ISurfaceComposer, data, reply);
		sp<IBinder> b = IInterface::asBinder(createConnection());
		reply->writeStrongBinder(b);
		return NO_ERROR;
		}
		case SET_TRANSACTION_STATE: {
		CHECK_INTERFACE(ISurfaceComposer, data, reply);

libs/gui/ISurfaceComposerClient.cpp

deleted100644 → 0

+0 −124

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2007 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		// tag as surfaceflinger
		#define LOG_TAG "SurfaceFlinger"

		#include <gui/ISurfaceComposerClient.h>

		#include <gui/IGraphicBufferProducer.h>

		#include <binder/SafeInterface.h>

		#include <ui/FrameStats.h>

		namespace android {

		namespace { // Anonymous

		enum class Tag : uint32_t {
		CREATE_SURFACE = IBinder::FIRST_CALL_TRANSACTION,
		CREATE_WITH_SURFACE_PARENT,
		CLEAR_LAYER_FRAME_STATS,
		GET_LAYER_FRAME_STATS,
		MIRROR_SURFACE,
		LAST = MIRROR_SURFACE,
		};

		} // Anonymous namespace

		class BpSurfaceComposerClient : public SafeBpInterface<ISurfaceComposerClient> {
		public:
		explicit BpSurfaceComposerClient(const sp<IBinder>& impl)
		: SafeBpInterface<ISurfaceComposerClient>(impl, "BpSurfaceComposerClient") {}

		~BpSurfaceComposerClient() override;

		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* outLayerId, uint32_t* outTransformHint) override {
		return callRemote<decltype(&ISurfaceComposerClient::createSurface)>(Tag::CREATE_SURFACE,
		name, width, height,
		format, flags, parent,
		std::move(metadata),
		handle, gbp, outLayerId,
		outTransformHint);
		}

		status_t createWithSurfaceParent(const String8& name, uint32_t width, uint32_t height,
		PixelFormat format, uint32_t flags,
		const sp<IGraphicBufferProducer>& parent,
		LayerMetadata metadata, sp<IBinder>* handle,
		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,
		outLayerId, outTransformHint);
		}

		status_t clearLayerFrameStats(const sp<IBinder>& handle) const override {
		return callRemote<decltype(
		&ISurfaceComposerClient::clearLayerFrameStats)>(Tag::CLEAR_LAYER_FRAME_STATS,
		handle);
		}

		status_t getLayerFrameStats(const sp<IBinder>& handle, FrameStats* outStats) const override {
		return callRemote<decltype(
		&ISurfaceComposerClient::getLayerFrameStats)>(Tag::GET_LAYER_FRAME_STATS, handle,
		outStats);
		}

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

		// Out-of-line virtual method definition to trigger vtable emission in this
		// translation unit (see clang warning -Wweak-vtables)
		BpSurfaceComposerClient::~BpSurfaceComposerClient() {}

		IMPLEMENT_META_INTERFACE(SurfaceComposerClient, "android.ui.ISurfaceComposerClient");

		// ----------------------------------------------------------------------

		status_t BnSurfaceComposerClient::onTransact(uint32_t code, const Parcel& data, Parcel* reply,
		uint32_t flags) {
		if (code < IBinder::FIRST_CALL_TRANSACTION \|\| code > static_cast<uint32_t>(Tag::LAST)) {
		return BBinder::onTransact(code, data, reply, flags);
		}
		auto tag = static_cast<Tag>(code);
		switch (tag) {
		case Tag::CREATE_SURFACE:
		return callLocal(data, reply, &ISurfaceComposerClient::createSurface);
		case Tag::CREATE_WITH_SURFACE_PARENT:
		return callLocal(data, reply, &ISurfaceComposerClient::createWithSurfaceParent);
		case Tag::CLEAR_LAYER_FRAME_STATS:
		return callLocal(data, reply, &ISurfaceComposerClient::clearLayerFrameStats);
		case Tag::GET_LAYER_FRAME_STATS:
		return callLocal(data, reply, &ISurfaceComposerClient::getLayerFrameStats);
		case Tag::MIRROR_SURFACE:
		return callLocal(data, reply, &ISurfaceComposerClient::mirrorSurface);
		}
		}

		} // namespace android