diff options
| -rw-r--r-- | camera/libcameraservice/CameraService.cpp | 6 | ||||
| -rw-r--r-- | core/java/android/hardware/Camera.java | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/camera/libcameraservice/CameraService.cpp b/camera/libcameraservice/CameraService.cpp index 701259e..96ee502 100644 --- a/camera/libcameraservice/CameraService.cpp +++ b/camera/libcameraservice/CameraService.cpp @@ -900,8 +900,6 @@ status_t CameraService::Client::setParameters(const String8& params) // get preview/capture parameters - key/value pairs String8 CameraService::Client::getParameters() const { - LOGD("getParameters"); - Mutex::Autolock lock(mLock); if (mHardware == 0) { @@ -909,7 +907,9 @@ String8 CameraService::Client::getParameters() const return String8(); } - return mHardware->getParameters().flatten(); + String8 params(mHardware->getParameters().flatten()); + LOGD("getParameters(%s)", params.string()); + return params; } void CameraService::Client::postAutoFocus(bool focused) diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java index 106c920..ca579b6 100644 --- a/core/java/android/hardware/Camera.java +++ b/core/java/android/hardware/Camera.java @@ -405,8 +405,6 @@ public class Camera { * @param params the Parameters to use for this Camera service */ public void setParameters(Parameters params) { - Log.e(TAG, "setParameters()"); - //params.dump(); native_setParameters(params.flatten()); } @@ -416,7 +414,6 @@ public class Camera { public Parameters getParameters() { Parameters p = new Parameters(); String s = native_getParameters(); - Log.e(TAG, "_getParameters: " + s); p.unflatten(s); return p; } |