diff options
| author | Dave Sparks <davidsparks@android.com> | 2009-05-21 10:27:18 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-05-21 10:27:18 -0700 |
| commit | 67d5fc6b5982ab091ad419a5adfc8b81e97d1de1 (patch) | |
| tree | 7f8052530ebba1a2c8a26f609196ae7d6b3fe59e /camera/libcameraservice | |
| parent | 51ec709aeeba4a3f6ce335786d1b126222c89020 (diff) | |
| parent | 7283fb18022674daee4dcdc3a218190791f8cd0e (diff) | |
| download | frameworks_base-67d5fc6b5982ab091ad419a5adfc8b81e97d1de1.zip frameworks_base-67d5fc6b5982ab091ad419a5adfc8b81e97d1de1.tar.gz frameworks_base-67d5fc6b5982ab091ad419a5adfc8b81e97d1de1.tar.bz2 | |
am 7283fb18: Merge commit \'7b7225c8fdbead25235c74811b30ff4ee690dc58\' into manual_merge
Merge commit '7283fb18022674daee4dcdc3a218190791f8cd0e'
* commit '7283fb18022674daee4dcdc3a218190791f8cd0e':
AI 149133: Enable the camera permission check.
Diffstat (limited to 'camera/libcameraservice')
| -rw-r--r-- | camera/libcameraservice/CameraService.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/camera/libcameraservice/CameraService.cpp b/camera/libcameraservice/CameraService.cpp index 8207da6..404512e 100644 --- a/camera/libcameraservice/CameraService.cpp +++ b/camera/libcameraservice/CameraService.cpp @@ -1084,7 +1084,6 @@ 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) { @@ -1121,6 +1120,7 @@ status_t CameraService::onTransact( } } #endif // DEBUG_HEAP_LEAKS + return err; } |