From 7b7225c8fdbead25235c74811b30ff4ee690dc58 Mon Sep 17 00:00:00 2001
From: Dave Sparks <nobody@android.com>
Date: Thu, 21 May 2009 09:18:18 -0700
Subject: [PATCH] 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
---
 camera/libcameraservice/CameraService.cpp | 5 +++--
 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 cb8ab58827c09..203b45ebe0bc8 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 6752f265dabbf..a421fd3a69869 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: