diff options
| author | Dave Sparks <davidsparks@android.com> | 2009-05-21 10:17:23 -0700 |
|---|---|---|
| committer | Dave Sparks <davidsparks@android.com> | 2009-05-21 10:17:23 -0700 |
| commit | 7283fb18022674daee4dcdc3a218190791f8cd0e (patch) | |
| tree | 68bbd8da7ea525fc53695a1ed6f1b234fbafa1ff /camera | |
| parent | 8c690ea9976d644db3c96eddbbbd2d50eac56913 (diff) | |
| parent | 7b7225c8fdbead25235c74811b30ff4ee690dc58 (diff) | |
| download | frameworks_base-7283fb18022674daee4dcdc3a218190791f8cd0e.zip frameworks_base-7283fb18022674daee4dcdc3a218190791f8cd0e.tar.gz frameworks_base-7283fb18022674daee4dcdc3a218190791f8cd0e.tar.bz2 | |
Merge commit '7b7225c8fdbead25235c74811b30ff4ee690dc58' into manual_merge
Conflicts:
camera/libcameraservice/CameraService.cpp
Diffstat (limited to 'camera')
| -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 46fc2d0..4e6859c 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; } |