diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2009-09-10 16:49:17 +0800 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2009-09-21 07:28:44 +0800 |
| commit | ffe1cf251a4f8469695b8acfa37270684dc1b70c (patch) | |
| tree | 61e5907167f3473dac5c4bd31da97f6e2137a522 /core/java/android/hardware | |
| parent | 2092361d586a20190c9137fb3cc9434cdc9ec99f (diff) | |
| download | frameworks_base-ffe1cf251a4f8469695b8acfa37270684dc1b70c.zip frameworks_base-ffe1cf251a4f8469695b8acfa37270684dc1b70c.tar.gz frameworks_base-ffe1cf251a4f8469695b8acfa37270684dc1b70c.tar.bz2 | |
Unhide Camera lock and unlock API.
Diffstat (limited to 'core/java/android/hardware')
| -rw-r--r-- | core/java/android/hardware/Camera.java | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java index a27307a..cc44400 100644 --- a/core/java/android/hardware/Camera.java +++ b/core/java/android/hardware/Camera.java @@ -137,7 +137,6 @@ public class Camera { * * @throws IOException if the method fails. * - * FIXME: Unhide after approval * @hide */ public native final void reconnect() throws IOException; @@ -150,25 +149,20 @@ public class Camera { * Camera object is locked. Locking it again from the same process will * have no effect. Attempting to lock it from another process if it has * not been unlocked will fail. - * Returns 0 if lock was successful. * - * FIXME: Unhide after approval - * @hide + * @throws RuntimeException if the method fails. */ - public native final int lock(); + public native final void lock(); /** * Unlock the camera to allow another process to access it. To save * setup/teardown time, a client of Camera can pass an initialized Camera * object to another process. This method is used to unlock the Camera * object before handing off the Camera object to the other process. - - * Returns 0 if unlock was successful. * - * FIXME: Unhide after approval - * @hide + * @throws RuntimeException if the method fails. */ - public native final int unlock(); + public native final void unlock(); /** * Sets the SurfaceHolder to be used for a picture preview. If the surface |