Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44ff0514 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 416 into donut 

* changes:
  Remove debug messages. 	modified:   core/java/android/hardware/Camera.java
parents 58d8a0bb ab5b424d

camera/libcameraservice/CameraService.cpp

+3 −3
Original line number Diff line number Diff line
@@ -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)

core/java/android/hardware/Camera.java

+0 −3
Original line number Diff line number Diff line
@@ -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;

    }