diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-21 07:55:39 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-21 07:55:39 -0700 |
| commit | db79edc5dc39e103356cad8781148a8794520bc5 (patch) | |
| tree | 30cc7397b9017fc857f2f229f00ac50f2cf0944c /camera/libcameraservice | |
| parent | 3343af5fdb10ace9e593d042fedcd9b42e322a95 (diff) | |
| parent | b1f3b8f7cb6c1d22b63bade2d75d54ceb4196070 (diff) | |
| download | frameworks_base-db79edc5dc39e103356cad8781148a8794520bc5.zip frameworks_base-db79edc5dc39e103356cad8781148a8794520bc5.tar.gz frameworks_base-db79edc5dc39e103356cad8781148a8794520bc5.tar.bz2 | |
Merge change 2168 into donut
* changes:
Fix permission hole in camera service. Some debugging code was added to CameraService::onTransact() method during development. Later on the entire onTransact() method was #ifdef'd out, which inadvertently omitted the permissions check code. This change restores the code.
Diffstat (limited to 'camera/libcameraservice')
| -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 f85ea9f..46fc2d0 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: |