diff options
| author | 2009-05-27 14:34:50 -0700 | |
|---|---|---|
| committer | 2009-05-27 14:34:50 -0700 | |
| commit | 2da99bdaa1712f00525e6a84b58044332cb1baef (patch) | |
| tree | ed330500de06dc645769ea87372fb624390b52a8 /camera/libcameraservice/CameraService.cpp | |
| parent | 947f4f4d384ea26eb2145cc070a3eed42c59534a (diff) | |
| parent | cc77841f643751fd9f128e90f7d1587445ef353e (diff) | |
Merge commit 'goog/master' into merge_master
Conflicts:
include/ui/Rect.h
libs/ui/ISurfaceComposer.cpp
Diffstat (limited to 'camera/libcameraservice/CameraService.cpp')
| -rw-r--r-- | camera/libcameraservice/CameraService.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/camera/libcameraservice/CameraService.cpp b/camera/libcameraservice/CameraService.cpp index 404512e1296d..453dc29369f6 100644 --- a/camera/libcameraservice/CameraService.cpp +++ b/camera/libcameraservice/CameraService.cpp @@ -1052,12 +1052,6 @@ status_t CameraService::dump(int fd, const Vector<String16>& args) } -#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 CameraService::onTransact( uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags) { |