diff options
| author | 2011-09-07 14:53:45 -0700 | |
|---|---|---|
| committer | 2011-09-07 14:53:45 -0700 | |
| commit | cb58757d2fc3dd23ca8da192fe6955fcb1fb801f (patch) | |
| tree | a551ceb5f1945c8ce32f45d6cde2ebbd628c02a6 | |
| parent | 1a58dce0cc9ae772c0025ecadac1fe3b3a06e1a0 (diff) | |
| parent | 4c454d82b6ca2e209323321ef2e712bd1577b032 (diff) | |
Merge "Unhide camera video snapshot supported API."
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/hardware/Camera.java | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index dd923be192bc..91002f227862 100644 --- a/api/current.txt +++ b/api/current.txt @@ -9327,6 +9327,7 @@ package android.hardware { method public boolean isAutoExposureLockSupported(); method public boolean isAutoWhiteBalanceLockSupported(); method public boolean isSmoothZoomSupported(); + method public boolean isVideoSnapshotSupported(); method public boolean isZoomSupported(); method public void remove(java.lang.String); method public void removeGpsData(); diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java index 63f2244a5a8a..58f7869f5e95 100644 --- a/core/java/android/hardware/Camera.java +++ b/core/java/android/hardware/Camera.java @@ -3233,7 +3233,6 @@ public class Camera { * captured pictures. * * @return true if video snapshot is supported. - * @hide */ public boolean isVideoSnapshotSupported() { String str = get(KEY_VIDEO_SNAPSHOT_SUPPORTED); |