Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d1ff3a4 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change I77153ee0 into eclair 

* changes:
  Hide zoom api.
parents 91c6bdd2 77153ee0

api/current.xml

+0 −36
Original line number Diff line number Diff line
@@ -67548,19 +67548,6 @@ 
<exception name="IOException" type="java.io.IOException">

</exception>

</method>

<method name="setZoomCallback"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="cb" type="android.hardware.Camera.ZoomCallback">

</parameter>

</method>

<method name="startPreview"

 return="void"

 abstract="false"
@@ -68941,29 +68928,6 @@ 
>

</field>

</class>

<interface name="Camera.ZoomCallback"

 abstract="true"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<method name="onZoomUpdate"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="zoomLevel" type="int">

</parameter>

<parameter name="camera" type="android.hardware.Camera">

</parameter>

</method>

</interface>

<class name="GeomagneticField"

 extends="java.lang.Object"

 abstract="false"

core/java/android/hardware/Camera.java

+3 −0
Original line number Diff line number Diff line
@@ -469,6 +469,8 @@ public class Camera { 


    /**

     * Handles the zoom callback.

     *

     * @hide

     */

    public interface ZoomCallback

    {
@@ -487,6 +489,7 @@ public class Camera { 
     * Registers a callback to be invoked when the zoom

     * level is updated by the camera driver.

     * @param cb the callback to run

     * @hide

     */

    public final void setZoomCallback(ZoomCallback cb)

    {