diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-21 09:42:24 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-05-21 09:42:24 -0700 |
| commit | a59fa9b6cba9cae0f7d02e240dbd10603cc127a5 (patch) | |
| tree | 4312fdaa243462b3860466e2849ad2d795e2dee4 /camera | |
| parent | 9178bd31ae83e681c7ab326811772327fc2e8b47 (diff) | |
| parent | db79edc5dc39e103356cad8781148a8794520bc5 (diff) | |
| download | frameworks_base-a59fa9b6cba9cae0f7d02e240dbd10603cc127a5.zip frameworks_base-a59fa9b6cba9cae0f7d02e240dbd10603cc127a5.tar.gz frameworks_base-a59fa9b6cba9cae0f7d02e240dbd10603cc127a5.tar.bz2 | |
am db79edc5: Merge change 2168 into donut
Merge commit 'db79edc5dc39e103356cad8781148a8794520bc5'
* commit 'db79edc5dc39e103356cad8781148a8794520bc5':
Fix permission hole in camera service. Some debugging code was added
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/libcameraservice/CameraService.cpp | 7 | ||||
| -rw-r--r-- | camera/libcameraservice/CameraService.h | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/camera/libcameraservice/CameraService.cpp b/camera/libcameraservice/CameraService.cpp index 4f0fe21..8207da6 100644 --- a/camera/libcameraservice/CameraService.cpp +++ b/camera/libcameraservice/CameraService.cpp @@ -1052,8 +1052,6 @@ status_t CameraService::dump(int fd, const Vector<String16>& args) } -#if DEBUG_HEAP_LEAKS - #define CHECK_INTERFACE(interface, data, reply) \ do { if (!data.enforceInterface(interface::getInterfaceDescriptor())) { \ LOGW("Call incorrectly routed to " #interface); \ @@ -1085,6 +1083,8 @@ status_t CameraService::onTransact( status_t err = BnCameraService::onTransact(code, data, reply, flags); +#if DEBUG_HEAP_LEAKS + LOGD("+++ onTransact err %d code %d", err, code); if (err == UNKNOWN_TRANSACTION || err == PERMISSION_DENIED) { @@ -1120,9 +1120,8 @@ status_t CameraService::onTransact( break; } } +#endif // DEBUG_HEAP_LEAKS return err; } -#endif // DEBUG_HEAP_LEAKS - }; // namespace android diff --git a/camera/libcameraservice/CameraService.h b/camera/libcameraservice/CameraService.h index 6752f26..a421fd3 100644 --- a/camera/libcameraservice/CameraService.h +++ b/camera/libcameraservice/CameraService.h @@ -58,10 +58,8 @@ public: void removeClient(const sp<ICameraClient>& cameraClient); -#if DEBUG_HEAP_LEAKS virtual status_t onTransact( uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags); -#endif private: |