summaryrefslogtreecommitdiffstats
path: root/camera/libcameraservice/CameraService.h
diff options
context:
space:
mode:
authorDave Sparks <nobody@android.com>2009-05-21 09:18:18 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-05-21 09:18:18 -0700
commit7b7225c8fdbead25235c74811b30ff4ee690dc58 (patch)
treed0bf06abdbc0d7414245dd88d909439232cb7fab /camera/libcameraservice/CameraService.h
parent221c95526d3e3e23288478b6dd2d24b5ec7e97d5 (diff)
downloadframeworks_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/CameraService.h')
-rw-r--r--camera/libcameraservice/CameraService.h2
1 files changed, 0 insertions, 2 deletions
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: