Merge "Allow Camera.setDisplayOrientation to be called when preview is active."

2011-10-07 03:08:23 -07:00
parent 1d6f70c8de d303362ac2
commit 3c02c12c73
2 changed files with 8 additions and 4 deletions
--- a/core/java/android/hardware/Camera.java
+++ b/core/java/android/hardware/Camera.java
@@ -1007,6 +1007,10 @@ public class Camera {
     *     camera.setDisplayOrientation(result);
     * }
     * </pre>
+     *
+     * <p>Starting from API level 14, this method can be called when preview is
+     * active.
+     *
     * @param degrees the angle that the picture will be rotated clockwise.
     *                Valid values are 0, 90, 180, and 270. The starting
     *                position is 0 (landscape).