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

Commit b0ba3067 authored by Fei Zhang's avatar Fei Zhang Committed by Linux Build Service Account
Browse files

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

Instead of using different KEYs, we can share one same key,
for set/get 3A parameters from APK.

Change-Id: Ie3216ee4e1b8f62fcdd57a0be119d4b8dcdd81b3
parent 924c4e9c

core/java/android/hardware/Camera.java

+2 −8
Original line number Diff line number Diff line
@@ -4482,7 +4482,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";
@@ -4511,7 +4510,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";

        private static final String KEY_QC_AUTO_HDR_ENABLE = "auto-hdr-enable";
@@ -5420,14 +5418,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
@@ -5495,7 +5489,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);

         }