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

Commit c3727864 authored by Daniel Hillenbrand's avatar Daniel Hillenbrand Committed by Gerrit Code Review
Browse files

Merge "camera: ISO mode support (1/2)" into ics

parents 293c5f13 77df2901

core/java/android/hardware/Camera.java

+4 −4
Original line number Diff line number Diff line
@@ -1753,8 +1753,8 @@ public class Camera { 
        public static final String ANTIBANDING_50HZ = "50hz";

        public static final String ANTIBANDING_60HZ = "60hz";

        public static final String ANTIBANDING_OFF = "off";

        //Values for ISO settings



        //Values for ISO settings

        /** @hide */

        public static final String ISO_AUTO = "auto";

        /** @hide */
@@ -3787,7 +3787,7 @@ public class Camera { 
         * @hide

         * Gets the supported ISO values.

         *

         * @return a List of FLASH_MODE_XXX string constants. null if flash mode

         * @return a list of ISO_XXX string constants. null if ISO

         *         setting is not supported.

         */

        public List<String> getSupportedIsoValues() {

include/camera/CameraParameters.h

+5 −3
Original line number Diff line number Diff line
@@ -659,6 +659,8 @@ public: 
    static const char KEY_METERING[];

    static const char KEY_WDR[];

    static const char KEY_ANTI_SHAKE_MODE[];

    static const char KEY_ISO_MODE[];

    static const char KEY_SUPPORTED_ISO_MODES[];

#endif



    // Values for white balance settings.

libs/camera/CameraParameters.cpp

+2 −0
Original line number Diff line number Diff line
@@ -144,6 +144,8 @@ const char CameraParameters::KEY_SUPPORTED_HDR_IMAGING_MODES[] = "hdr-values"; 
const char CameraParameters::KEY_METERING[] = "metering";

const char CameraParameters::KEY_WDR[] = "wdr";

const char CameraParameters::KEY_ANTI_SHAKE_MODE[] = "anti-shake";

const char CameraParameters::KEY_ISO_MODE[] = "iso";

const char CameraParameters::KEY_SUPPORTED_ISO_MODES[] = "iso-values";

#endif

const char CameraParameters::KEY_VIDEO_SIZE[] = "video-size";

const char CameraParameters::KEY_SUPPORTED_VIDEO_SIZES[] = "video-size-values";