summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chih-Chung Chang <chihchung@google.com> 2010-01-27 10:24:42 -0800
committer Chih-Chung Chang <chihchung@google.com> 2010-01-27 17:05:21 -0800
commite7bd22a9d9441916aa9c67d80ee9f02a2d3e10e5 (patch)
tree3b779c292cb051157853958b83953d7e25698362
parent83e5ff09d5ea440c3d32c9293449701d2475f4eb (diff)
Unhide camera api for set display orientation.
-rw-r--r--api/current.xml13
-rw-r--r--core/java/android/hardware/Camera.java4
2 files changed, 15 insertions, 2 deletions
diff --git a/api/current.xml b/api/current.xml
index b65434a4fa61..a32c7576b82a 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -69645,6 +69645,19 @@
visibility="public"
>
</method>
+<method name="setDisplayOrientation"
+ return="void"
+ abstract="false"
+ native="true"
+ synchronized="false"
+ static="false"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="degrees" type="int">
+</parameter>
+</method>
<method name="setErrorCallback"
return="void"
abstract="false"
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java
index 4c4455a4c516..abb74cd31392 100644
--- a/core/java/android/hardware/Camera.java
+++ b/core/java/android/hardware/Camera.java
@@ -552,8 +552,8 @@ public class Camera {
* be called during preview.
*
* @param degrees the angle that the picture will be rotated clockwise.
- * Valid values are 0, 90, 180, and 270.
- * @hide
+ * Valid values are 0, 90, 180, and 270. The starting
+ * position is 0 (landscape).
*/
public native final void setDisplayOrientation(int degrees);