Merge "Update camera javadoc about AE and AWB lock." into ics-factoryrom

    // recalculate exposure values). Changing exposure compensation

    // recalculate exposure values). Changing exposure compensation

    // settings will still affect the exposure settings while

    // settings will still affect the exposure settings while

    // auto-exposure is locked. Stopping preview or taking a still

    // auto-exposure is locked. Stopping preview or taking a still

    // image will release the lock. However, the lock can be

    // image will not change the lock. In conjunction with

    // re-enabled prior to preview being re-started, to keep the

    // exposure values from the previous lock. In conjunction with

    // exposure compensation, this allows for capturing multi-exposure

    // exposure compensation, this allows for capturing multi-exposure

    // brackets with known relative exposure values. Locking

    // brackets with known relative exposure values. Locking

    // auto-exposure after open but before the first call to

    // auto-exposure after open but before the first call to

    // startPreview may result in severely over- or under-exposed

    // startPreview may result in severely over- or under-exposed

    // images.  The driver may independently enable the AE lock after

    // images.  The driver will not change the AE lock after

    // auto-focus completes. If it does so, this key must have its

    // auto-focus completes.

    // value updated to reflect the lock's existence. Applications are

    // free to release such a lock, to re-enable AE without restarting

    // preview.

    static const char KEY_AUTO_EXPOSURE_LOCK[];

    static const char KEY_AUTO_EXPOSURE_LOCK[];

    // Whether locking the auto-exposure is supported. "true" means it is, and

    // Whether locking the auto-exposure is supported. "true" means it is, and

    // "false" or this key not existing means it is not supported.

    // "false" or this key not existing means it is not supported.

    // change white balance values. If auto-white balance is already

    // change white balance values. If auto-white balance is already

    // locked, setting this to true again has no effect (the driver

    // locked, setting this to true again has no effect (the driver

    // will not recalculate white balance values). Stopping preview or

    // will not recalculate white balance values). Stopping preview or

    // taking a still image will release the lock. However, the lock

    // taking a still image will not change the lock. In conjunction

    // can be re-enabled prior to preview being re-started, to keep

    // the white balance values from the previous lock. In conjunction

    // with exposure compensation, this allows for capturing

    // with exposure compensation, this allows for capturing

    // multi-exposure brackets with fixed white balance. Locking

    // multi-exposure brackets with fixed white balance. Locking

    // auto-white balance after open but before the first call to

    // auto-white balance after open but before the first call to

    // startPreview may result in severely incorrect color.  The

    // startPreview may result in severely incorrect color.  The

    // driver may independently enable the AWB lock after auto-focus

    // driver will not change the AWB lock after auto-focus

    // completes. If it does so, this key must have its value updated

    // completes.

    // to reflect the lock's existence. Applications are free to

    // release such a lock, to re-enable AWB without restarting

    // preview.

    static const char KEY_AUTO_WHITEBALANCE_LOCK[];

    static const char KEY_AUTO_WHITEBALANCE_LOCK[];

    // Whether locking the auto-white balance is supported. "true"

    // Whether locking the auto-white balance is supported. "true"

    // means it is, and "false" or this key not existing means it is

    // means it is, and "false" or this key not existing means it is