diff options
| author | Dave Sparks <nobody@android.com> | 2009-05-21 09:18:18 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-05-21 09:18:18 -0700 |
| commit | 7b7225c8fdbead25235c74811b30ff4ee690dc58 (patch) | |
| tree | d0bf06abdbc0d7414245dd88d909439232cb7fab /camera/libcameraservice | |
| parent | 221c95526d3e3e23288478b6dd2d24b5ec7e97d5 (diff) | |
| download | frameworks_base-7b7225c8fdbead25235c74811b30ff4ee690dc58.zip frameworks_base-7b7225c8fdbead25235c74811b30ff4ee690dc58.tar.gz frameworks_base-7b7225c8fdbead25235c74811b30ff4ee690dc58.tar.bz2 | |
AI 149133: Enable the camera permission check.
Some debugging code was added to camera service. Later it was #ifdef'd
out, but this change also removed the camera permission check. This
change puts the permission check back in.
BUG=1869264
Automated import of CL 149133
Diffstat (limited to 'camera/libcameraservice')
| -rw-r--r-- | camera/libcameraservice/CameraService.cpp | 5 | ||||
| -rw-r--r-- | camera/libcameraservice/CameraService.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/camera/libcameraservice/CameraService.cpp b/camera/libcameraservice/CameraService.cpp index cb8ab58..203b45e 100644 --- a/camera/libcameraservice/CameraService.cpp +++ b/camera/libcameraservice/CameraService.cpp @@ -1046,7 +1046,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())) { \ @@ -1079,6 +1078,7 @@ 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) { @@ -1114,9 +1114,10 @@ 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: |