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

Commit dd79b4c8 authored by Pannag Sanketi's avatar Pannag Sanketi Committed by Android (Google) Code Review
Browse files

Merge "Expose video stabilization API" into ics-mr1

parents 62015f5d d47823e3

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -9366,6 +9366,7 @@ package android.hardware { 
    method public java.util.List<android.hardware.Camera.Size> getSupportedVideoSizes();

    method public java.util.List<java.lang.String> getSupportedWhiteBalance();

    method public float getVerticalViewAngle();

    method public boolean getVideoStabilization();

    method public java.lang.String getWhiteBalance();

    method public int getZoom();

    method public java.util.List<java.lang.Integer> getZoomRatios();
@@ -9373,6 +9374,7 @@ package android.hardware { 
    method public boolean isAutoWhiteBalanceLockSupported();

    method public boolean isSmoothZoomSupported();

    method public boolean isVideoSnapshotSupported();

    method public boolean isVideoStabilizationSupported();

    method public boolean isZoomSupported();

    method public void remove(java.lang.String);

    method public void removeGpsData();
@@ -9404,6 +9406,7 @@ package android.hardware { 
    method public void setRecordingHint(boolean);

    method public void setRotation(int);

    method public void setSceneMode(java.lang.String);

    method public void setVideoStabilization(boolean);

    method public void setWhiteBalance(java.lang.String);

    method public void setZoom(int);

    method public void unflatten(java.lang.String);

core/java/android/hardware/Camera.java

+0 −3
Original line number Diff line number Diff line
@@ -3256,7 +3256,6 @@ public class Camera { 
         * disable video stabilization.

         * @see #isVideoStabilizationSupported()

         * @see #getVideoStabilization()

         * @hide

         */

        public void setVideoStabilization(boolean toggle) {

            set(KEY_VIDEO_STABILIZATION, toggle ? TRUE : FALSE);
@@ -3269,7 +3268,6 @@ public class Camera { 
         * @return true if video stabilization is enabled

         * @see #isVideoStabilizationSupported()

         * @see #setVideoStabilization(boolean)

         * @hide

         */

        public boolean getVideoStabilization() {

            String str = get(KEY_VIDEO_STABILIZATION);
@@ -3283,7 +3281,6 @@ public class Camera { 
         * @return true if video stabilization is supported

         * @see #setVideoStabilization(boolean)

         * @see #getVideoStabilization()

         * @hide

         */

        public boolean isVideoStabilizationSupported() {

            String str = get(KEY_VIDEO_STABILIZATION_SUPPORTED);