Merge change I7ed72bf5 into eclair

* changes: Add documentation for scene mode. Other parameters may be changed after setting scene mode.
2009-09-30 22:48:02 -04:00
parent 3f56d21bf1 2988ab7c32
commit 5e5001bc1a
1 changed files with 5 additions and 1 deletions
--- a/core/java/android/hardware/Camera.java
+++ b/core/java/android/hardware/Camera.java
@@ -1281,7 +1281,11 @@ public class Camera {
        }

        /**
-         * Sets the scene mode.
+         * Sets the scene mode. Other parameters may be changed after changing
+         * scene mode. For example, flash and supported flash mode may be
+         * changed to "off" in night scene mode. After setting scene mode,
+         * applications should call getParameters to know if some parameters are
+         * changed.
         *
         * @param value SCENE_MODE_XXX string constants.
         */