From 46ad796186bdca8bac75607340aa0fac0c34a9d8 Mon Sep 17 00:00:00 2001
From: Chih-Chung Chang <chihchung@google.com>
Date: Wed, 16 Sep 2009 17:24:48 +0800
Subject: [PATCH] Unhide cancelAutoFocus API in Camera.

Change-Id: I29450867edf9c68ac06e6d76fae0ad93ea89b632
---
 api/current.xml                        | 11 +++++++++++
 core/java/android/hardware/Camera.java |  1 -
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/api/current.xml b/api/current.xml
index 3c6eb9b7ca49d..49f88ba87a298 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -66999,6 +66999,17 @@
 <parameter name="cb" type="android.hardware.Camera.AutoFocusCallback">
 </parameter>
 </method>
+<method name="cancelAutoFocus"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
 <method name="getParameters"
  return="android.hardware.Camera.Parameters"
  abstract="false"
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java
index 0661fed507c6e..13effe00eacac 100644
--- a/core/java/android/hardware/Camera.java
+++ b/core/java/android/hardware/Camera.java
@@ -387,7 +387,6 @@ public class Camera {
      * this function will cancel it. Whether the auto-focus is in progress
      * or not, this function will return the focus position to the default.
      * If the camera does not support auto-focus, this is a no-op.
-     * @hide
      */
     public final void cancelAutoFocus()
     {