diff options
| author | Mathias Agopian <mathias@google.com> | 2011-11-29 13:07:24 -0800 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2011-11-29 13:07:40 -0800 |
| commit | f9e88fbee04f83638b07546741196bd4c242ef54 (patch) | |
| tree | a0b0da85f2411f6a025637cd082f1efced6790e5 /libs/gui | |
| parent | e11ec1df421be0b1a18fd3cf6ec23361d86ca32a (diff) | |
| download | frameworks_base-f9e88fbee04f83638b07546741196bd4c242ef54.zip frameworks_base-f9e88fbee04f83638b07546741196bd4c242ef54.tar.gz frameworks_base-f9e88fbee04f83638b07546741196bd4c242ef54.tar.bz2 | |
Fix build.
Revert "Add support for sending VSYNC events to the framework"
This reverts commit f3918c5bd4bc9f02f74da42995564150ca2dd382.
Change-Id: I998e3e1aa3fa310829ae973b64fe11b01f6f468f
Diffstat (limited to 'libs/gui')
| -rw-r--r-- | libs/gui/Android.mk | 2 | ||||
| -rw-r--r-- | libs/gui/ISurfaceComposer.cpp | 32 |
2 files changed, 0 insertions, 34 deletions
diff --git a/libs/gui/Android.mk b/libs/gui/Android.mk index b8be67d..b7e3ee3 100644 --- a/libs/gui/Android.mk +++ b/libs/gui/Android.mk @@ -3,8 +3,6 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES:= \ BitTube.cpp \ - DisplayEventReceiver.cpp \ - IDisplayEventConnection.cpp \ ISensorEventConnection.cpp \ ISensorServer.cpp \ ISurfaceTexture.cpp \ diff --git a/libs/gui/ISurfaceComposer.cpp b/libs/gui/ISurfaceComposer.cpp index db32827..86bc62a 100644 --- a/libs/gui/ISurfaceComposer.cpp +++ b/libs/gui/ISurfaceComposer.cpp @@ -29,9 +29,6 @@ #include <surfaceflinger/ISurfaceComposer.h> -#include <gui/BitTube.h> -#include <gui/IDisplayEventConnection.h> - #include <ui/DisplayInfo.h> #include <gui/ISurfaceTexture.h> @@ -47,8 +44,6 @@ namespace android { -class IDisplayEventConnection; - class BpSurfaceComposer : public BpInterface<ISurfaceComposer> { public: @@ -179,27 +174,6 @@ public: } return result != 0; } - - virtual sp<IDisplayEventConnection> createDisplayEventConnection() - { - Parcel data, reply; - sp<IDisplayEventConnection> result; - int err = data.writeInterfaceToken( - ISurfaceComposer::getInterfaceDescriptor()); - if (err != NO_ERROR) { - return result; - } - err = remote()->transact( - BnSurfaceComposer::CREATE_DISPLAY_EVENT_CONNECTION, - data, &reply); - if (err != NO_ERROR) { - LOGE("ISurfaceComposer::createDisplayEventConnection: error performing " - "transaction: %s (%d)", strerror(-err), -err); - return result; - } - result = interface_cast<IDisplayEventConnection>(reply.readStrongBinder()); - return result; - } }; IMPLEMENT_META_INTERFACE(SurfaceComposer, "android.ui.ISurfaceComposer"); @@ -280,12 +254,6 @@ status_t BnSurfaceComposer::onTransact( int32_t result = authenticateSurfaceTexture(surfaceTexture) ? 1 : 0; reply->writeInt32(result); } break; - case CREATE_DISPLAY_EVENT_CONNECTION: { - CHECK_INTERFACE(ISurfaceComposer, data, reply); - sp<IDisplayEventConnection> connection(createDisplayEventConnection()); - reply->writeStrongBinder(connection->asBinder()); - return NO_ERROR; - } break; default: return BBinder::onTransact(code, data, reply, flags); } |