summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorPannag Sanketi <psanketi@google.com>2011-10-31 15:05:19 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-10-31 15:05:19 -0700
commitdd79b4c85a9dd2c2ad702ea2137fe2a076567fa1 (patch)
treeed2870698a188ff9293ef2c1c87816dd86cc93ac /core
parent62015f5d0d1104dfc682b3eb3b6c0be4f63b985a (diff)
parentd47823e359ac346c7a1b9051866a72e8436f82cd (diff)
downloadframeworks_base-dd79b4c85a9dd2c2ad702ea2137fe2a076567fa1.zip
frameworks_base-dd79b4c85a9dd2c2ad702ea2137fe2a076567fa1.tar.gz
frameworks_base-dd79b4c85a9dd2c2ad702ea2137fe2a076567fa1.tar.bz2
Merge "Expose video stabilization API" into ics-mr1
Diffstat (limited to 'core')
-rw-r--r--core/java/android/hardware/Camera.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java
index caad6fd..93a1b6c 100644
--- a/core/java/android/hardware/Camera.java
+++ b/core/java/android/hardware/Camera.java
@@ -3256,7 +3256,6 @@ public class Camera {
* disable video stabilization.
* @see #isVideoStabilizationSupported()
* @see #getVideoStabilization()
- * @hide
*/
public void setVideoStabilization(boolean toggle) {
set(KEY_VIDEO_STABILIZATION, toggle ? TRUE : FALSE);
@@ -3269,7 +3268,6 @@ public class Camera {
* @return true if video stabilization is enabled
* @see #isVideoStabilizationSupported()
* @see #setVideoStabilization(boolean)
- * @hide
*/
public boolean getVideoStabilization() {
String str = get(KEY_VIDEO_STABILIZATION);
@@ -3283,7 +3281,6 @@ public class Camera {
* @return true if video stabilization is supported
* @see #setVideoStabilization(boolean)
* @see #getVideoStabilization()
- * @hide
*/
public boolean isVideoStabilizationSupported() {
String str = get(KEY_VIDEO_STABILIZATION_SUPPORTED);