diff options
| author | 2009-05-27 14:34:50 -0700 | |
|---|---|---|
| committer | 2009-05-27 14:34:50 -0700 | |
| commit | 723ec00af46d1f95d69fe5af53e0a5d09f01a7d6 (patch) | |
| tree | ef596c117b8f11f8025770c52baeac04b2e4551a /libs/ui/ISurfaceFlingerClient.cpp | |
| parent | 310f8da0c3122ed5419db8f12a6e98d3188325b2 (diff) | |
| parent | 39afd5f7daaa525adaf38caf4a48d2cb22e0a41d (diff) | |
Merge commit 'goog/master' into merge_master
Conflicts:
include/ui/Rect.h
libs/ui/ISurfaceComposer.cpp
Diffstat (limited to 'libs/ui/ISurfaceFlingerClient.cpp')
| -rw-r--r-- | libs/ui/ISurfaceFlingerClient.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libs/ui/ISurfaceFlingerClient.cpp b/libs/ui/ISurfaceFlingerClient.cpp index c2f6f8340c..46c12afe89 100644 --- a/libs/ui/ISurfaceFlingerClient.cpp +++ b/libs/ui/ISurfaceFlingerClient.cpp @@ -118,12 +118,6 @@ IMPLEMENT_META_INTERFACE(SurfaceFlingerClient, "android.ui.ISurfaceFlingerClient // ---------------------------------------------------------------------- -#define CHECK_INTERFACE(interface, data, reply) \ - do { if (!data.enforceInterface(interface::getInterfaceDescriptor())) { \ - LOGW("Call incorrectly routed to " #interface); \ - return PERMISSION_DENIED; \ - } } while (0) - status_t BnSurfaceFlingerClient::onTransact( uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags) { |