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

Commit bf9b0b9b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Camera: use single KEY for set/get manual 3A parameters."

parents 8f37516a e7185289

core/java/android/hardware/Camera.java

+2 −8
Original line number Diff line number Diff line
@@ -4171,7 +4171,6 @@ public class Camera { 
        private static final String KEY_QC_TOUCH_INDEX_AF = "touch-index-af";

        private static final String KEY_QC_MANUAL_FOCUS_POSITION = "manual-focus-position";

        private static final String KEY_QC_MANUAL_FOCUS_POS_TYPE = "manual-focus-pos-type";

        private static final String KEY_QC_CURRENT_FOCUS_POSITION = "current-focus-position";

        private static final String KEY_QC_SCENE_DETECT = "scene-detect";

        private static final String KEY_QC_ISO_MODE = "iso";

        private static final String KEY_QC_EXPOSURE_TIME = "exposure-time";
@@ -4200,7 +4199,6 @@ public class Camera { 
        private static final String KEY_QC_POWER_MODE = "power-mode";

        private static final String KEY_QC_POWER_MODE_SUPPORTED = "power-mode-supported";

        private static final String KEY_QC_WB_MANUAL_CCT = "wb-manual-cct";

        private static final String KEY_QC_WB_CURRENT_CCT = "wb-current-cct";

        private static final String KEY_QC_MIN_WB_CCT = "min-wb-cct";

        private static final String KEY_QC_MAX_WB_CCT = "max-wb-cct";
@@ -5108,14 +5106,10 @@ public class Camera { 
         /** @hide

         * Gets the current WB CCT.

         *

         * Pay attention to KEY_QC_WB_MANUAL_CCT and KEY_QC_WB_CURRENT_CCT.

         * The former is set by APK.

         * The latter is updated from HAL, usually in AWB mode.

         *

         * @return CCT value

         */

         public String getWBCurrentCCT() {

            return get(KEY_QC_WB_CURRENT_CCT);

            return get(KEY_QC_WB_MANUAL_CCT);

         }



         /** @hide
@@ -5174,7 +5168,7 @@ public class Camera { 
         * @return current focus position

         */

         public String getCurrentFocusPosition() {

            return get(KEY_QC_CURRENT_FOCUS_POSITION);

            return get(KEY_QC_MANUAL_FOCUS_POSITION);

         }