From a615e47ef0ebdf6ab666dbc4c51df33ed11ff00a Mon Sep 17 00:00:00 2001 From: Dan Stoza Date: Thu, 23 Mar 2017 14:41:55 -0700 Subject: libgui: Make ISurfaceComposerClient a SafeInterface Converts ISurfaceComposerClient (specifically its Bp/Bn children) to be SafeInterfaces such that all parceling/unparceling is done automatically. Test: Manual testing Change-Id: Ie5eee51fc893b0e4d7c3b498fe756306f9a029b5 --- libs/gui/ISurfaceComposerClient.cpp | 203 ++++++++++-------------------------- 1 file changed, 54 insertions(+), 149 deletions(-) (limited to 'libs/gui/ISurfaceComposerClient.cpp') diff --git a/libs/gui/ISurfaceComposerClient.cpp b/libs/gui/ISurfaceComposerClient.cpp index db8a517d4d..853e23a8cd 100644 --- a/libs/gui/ISurfaceComposerClient.cpp +++ b/libs/gui/ISurfaceComposerClient.cpp @@ -17,116 +17,64 @@ // tag as surfaceflinger #define LOG_TAG "SurfaceFlinger" -#include #include +#include #include -#include #include #include +#include +#include +#include #include #include #include #include -#include - -// --------------------------------------------------------------------------- namespace android { -enum { - CREATE_SURFACE = IBinder::FIRST_CALL_TRANSACTION, - DESTROY_SURFACE, - CLEAR_LAYER_FRAME_STATS, - GET_LAYER_FRAME_STATS, - GET_TRANSFORM_TO_DISPLAY_INVERSE -}; - -class BpSurfaceComposerClient : public BpInterface -{ +class BpSurfaceComposerClient : public SafeBpInterface { public: explicit BpSurfaceComposerClient(const sp& impl) - : BpInterface(impl) { - } - - virtual ~BpSurfaceComposerClient(); - - virtual status_t createSurface(const String8& name, uint32_t width, - uint32_t height, PixelFormat format, uint32_t flags, - const sp& parent, uint32_t windowType, uint32_t ownerUid, - sp* handle, sp* gbp) { - Parcel data, reply; - data.writeInterfaceToken(ISurfaceComposerClient::getInterfaceDescriptor()); - data.writeString8(name); - data.writeUint32(width); - data.writeUint32(height); - data.writeInt32(static_cast(format)); - data.writeUint32(flags); - data.writeUint32(windowType); - data.writeUint32(ownerUid); - if (parent != nullptr) { - data.writeStrongBinder(parent); - } - remote()->transact(CREATE_SURFACE, data, &reply); - *handle = reply.readStrongBinder(); - *gbp = interface_cast(reply.readStrongBinder()); - return reply.readInt32(); + : SafeBpInterface(impl, "BpSurfaceComposerClient") {} + + ~BpSurfaceComposerClient() override; + + status_t createSurface(const String8& name, uint32_t width, uint32_t height, PixelFormat format, + uint32_t flags, const sp& parent, uint32_t windowType, + uint32_t ownerUid, sp* handle, + sp* gbp) override { + return callRemote(Tag::CreateSurface, + name, width, height, + format, flags, parent, + windowType, ownerUid, + handle, gbp); } - virtual status_t destroySurface(const sp& handle) { - Parcel data, reply; - data.writeInterfaceToken(ISurfaceComposerClient::getInterfaceDescriptor()); - data.writeStrongBinder(handle); - remote()->transact(DESTROY_SURFACE, data, &reply); - return reply.readInt32(); + status_t destroySurface(const sp& handle) override { + return callRemote(Tag::DestroySurface, + handle); } - virtual status_t clearLayerFrameStats(const sp& handle) const { - Parcel data, reply; - data.writeInterfaceToken(ISurfaceComposerClient::getInterfaceDescriptor()); - data.writeStrongBinder(handle); - remote()->transact(CLEAR_LAYER_FRAME_STATS, data, &reply); - return reply.readInt32(); + status_t clearLayerFrameStats(const sp& handle) const override { + return callRemote(Tag::ClearLayerFrameStats, handle); } - virtual status_t getLayerFrameStats(const sp& handle, FrameStats* outStats) const { - Parcel data, reply; - data.writeInterfaceToken(ISurfaceComposerClient::getInterfaceDescriptor()); - data.writeStrongBinder(handle); - remote()->transact(GET_LAYER_FRAME_STATS, data, &reply); - reply.read(*outStats); - return reply.readInt32(); + status_t getLayerFrameStats(const sp& handle, FrameStats* outStats) const override { + return callRemote(Tag::GetLayerFrameStats, handle, + outStats); } - virtual status_t getTransformToDisplayInverse(const sp& handle, - bool* outTransformToDisplayInverse) const { - Parcel data, reply; - status_t result = - data.writeInterfaceToken(ISurfaceComposerClient::getInterfaceDescriptor()); - if (result != NO_ERROR) { - return result; - } - result = data.writeStrongBinder(handle); - if (result != NO_ERROR) { - return result; - } - result = remote()->transact(GET_TRANSFORM_TO_DISPLAY_INVERSE, data, &reply); - if (result != NO_ERROR) { - return result; - } - int transformInverse; - result = reply.readInt32(&transformInverse); - if (result != NO_ERROR) { - return result; - } - *outTransformToDisplayInverse = transformInverse != 0 ? true : false; - status_t result2 = reply.readInt32(&result); - if (result2 != NO_ERROR) { - return result2; - } - return result; + status_t getTransformToDisplayInverse(const sp& handle, + bool* outTransformToDisplayInverse) const override { + return callRemote(Tag::GetTransformToDisplayInverse, handle, + outTransformToDisplayInverse); } }; @@ -138,75 +86,32 @@ IMPLEMENT_META_INTERFACE(SurfaceComposerClient, "android.ui.ISurfaceComposerClie // ---------------------------------------------------------------------- -status_t BnSurfaceComposerClient::onTransact( - uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags) -{ - switch(code) { - case CREATE_SURFACE: { - CHECK_INTERFACE(ISurfaceComposerClient, data, reply); - String8 name = data.readString8(); - uint32_t width = data.readUint32(); - uint32_t height = data.readUint32(); - PixelFormat format = static_cast(data.readInt32()); - uint32_t createFlags = data.readUint32(); - uint32_t windowType = data.readUint32(); - uint32_t ownerUid = data.readUint32(); - sp parent = nullptr; - if (data.dataAvail() > 0) { - parent = data.readStrongBinder(); - } - sp handle; - sp gbp; - status_t result = createSurface(name, width, height, format, - createFlags, parent, windowType, ownerUid, &handle, &gbp); - reply->writeStrongBinder(handle); - reply->writeStrongBinder(IInterface::asBinder(gbp)); - reply->writeInt32(result); - return NO_ERROR; +status_t BnSurfaceComposerClient::onTransact(uint32_t code, const Parcel& data, Parcel* reply, + uint32_t flags) { + if (code < IBinder::FIRST_CALL_TRANSACTION || code >= static_cast(Tag::Last)) { + return BBinder::onTransact(code, data, reply, flags); + } + auto tag = static_cast(code); + switch (tag) { + case Tag::CreateSurface: { + return callLocal(data, reply, &ISurfaceComposerClient::createSurface); } - case DESTROY_SURFACE: { - CHECK_INTERFACE(ISurfaceComposerClient, data, reply); - reply->writeInt32(destroySurface( data.readStrongBinder() ) ); - return NO_ERROR; + case Tag::DestroySurface: { + return callLocal(data, reply, &ISurfaceComposerClient::destroySurface); } - case CLEAR_LAYER_FRAME_STATS: { - CHECK_INTERFACE(ISurfaceComposerClient, data, reply); - sp handle = data.readStrongBinder(); - status_t result = clearLayerFrameStats(handle); - reply->writeInt32(result); - return NO_ERROR; + case Tag::ClearLayerFrameStats: { + return callLocal(data, reply, &ISurfaceComposerClient::clearLayerFrameStats); } - case GET_LAYER_FRAME_STATS: { - CHECK_INTERFACE(ISurfaceComposerClient, data, reply); - sp handle = data.readStrongBinder(); - FrameStats stats; - status_t result = getLayerFrameStats(handle, &stats); - reply->write(stats); - reply->writeInt32(result); - return NO_ERROR; + case Tag::GetLayerFrameStats: { + return callLocal(data, reply, &ISurfaceComposerClient::getLayerFrameStats); } - case GET_TRANSFORM_TO_DISPLAY_INVERSE: { - CHECK_INTERFACE(ISurfaceComposerClient, data, reply); - sp handle; - status_t result = data.readStrongBinder(&handle); - if (result != NO_ERROR) { - return result; - } - bool transformInverse = false; - result = getTransformToDisplayInverse(handle, &transformInverse); - if (result != NO_ERROR) { - return result; - } - result = reply->writeInt32(transformInverse ? 1 : 0); - if (result != NO_ERROR) { - return result; - } - result = reply->writeInt32(NO_ERROR); - return result; + case Tag::GetTransformToDisplayInverse: { + return callLocal(data, reply, &ISurfaceComposerClient::getTransformToDisplayInverse); } - default: + case Tag::Last: + // Should not be possible because of the check at the beginning of the method return BBinder::onTransact(code, data, reply, flags); } } -}; // namespace android +} // namespace android -- cgit v1.2.3-59-g8ed1b