summaryrefslogtreecommitdiff
path: root/core/java/android/hardware/Camera.java
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2011-10-07 03:08:23 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-10-07 03:08:23 -0700
commit3c02c12c73fa8719e49a5da6534750196efe3eba (patch)
tree8355193d9ba2d891eae54d1e6da944866a134d0a /core/java/android/hardware/Camera.java
parent1d6f70c8debf6144e9552ffb7c6e0637fd0c1adc (diff)
parentd303362ac21fb9de40f2f2366cbe7ecaa113dc12 (diff)
Merge "Allow Camera.setDisplayOrientation to be called when preview is active."
Diffstat (limited to 'core/java/android/hardware/Camera.java')
-rw-r--r--core/java/android/hardware/Camera.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java
index c3a14ca537f3..d65e6df12a6f 100644
--- 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).