Merge commit '7b7225c8fdbead25235c74811b30ff4ee690dc58' into manual_merge

Conflicts: camera/libcameraservice/CameraService.cpp
2009-05-21 10:17:23 -07:00
parent 8c690ea997 7b7225c8fd
commit 7283fb1802
1 changed files with 1 additions and 1 deletions
--- 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;
 }