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

Commit f353f948 authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Android (Google) Code Review
Browse files

Merge "NEW_API: Unhide android.hardware.Camera#enableShutterSound" into jb-mr1-dev

parents f60921d9 af87681f

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -9675,6 +9675,7 @@ package android.hardware { 
    method public final void addCallbackBuffer(byte[]);

    method public final void autoFocus(android.hardware.Camera.AutoFocusCallback);

    method public final void cancelAutoFocus();

    method public final boolean enableShutterSound(boolean);

    method public static void getCameraInfo(int, android.hardware.Camera.CameraInfo);

    method public static int getNumberOfCameras();

    method public android.hardware.Camera.Parameters getParameters();

core/java/android/hardware/Camera.java

+0 −1
Original line number Diff line number Diff line
@@ -1166,7 +1166,6 @@ public class Camera { 
     *         system shutter sound will play when a picture is taken.

     * @see #takePicture

     * @see ShutterCallback

     * @hide

     */

    public native final boolean enableShutterSound(boolean enabled);