Loading core/java/android/hardware/Camera.java +6 −1 Original line number Diff line number Diff line Loading @@ -1056,7 +1056,7 @@ public class Camera { private static final String KEY_SCENE_MODE = "scene-mode"; private static final String KEY_FLASH_MODE = "flash-mode"; private static final String KEY_FOCUS_MODE = "focus-mode"; private static final String KEY_ISO_MODE = "iso"; private /*static final*/ String KEY_ISO_MODE = "iso"; private static final String KEY_LENSSHADE = "lensshade"; private static final String KEY_FOCAL_LENGTH = "focal-length"; private static final String KEY_HORIZONTAL_VIEW_ANGLE = "horizontal-view-angle"; Loading Loading @@ -2759,6 +2759,11 @@ public class Camera { */ public List<String> getSupportedIsoValues() { String str = get(KEY_ISO_MODE + SUPPORTED_VALUES_SUFFIX); if (str == null && get("nv-mode-hint") != null) { /* Support NV cams */ KEY_ISO_MODE = "nv-picture-iso"; str = get(KEY_ISO_MODE + SUPPORTED_VALUES_SUFFIX); } return split(str); } Loading Loading
core/java/android/hardware/Camera.java +6 −1 Original line number Diff line number Diff line Loading @@ -1056,7 +1056,7 @@ public class Camera { private static final String KEY_SCENE_MODE = "scene-mode"; private static final String KEY_FLASH_MODE = "flash-mode"; private static final String KEY_FOCUS_MODE = "focus-mode"; private static final String KEY_ISO_MODE = "iso"; private /*static final*/ String KEY_ISO_MODE = "iso"; private static final String KEY_LENSSHADE = "lensshade"; private static final String KEY_FOCAL_LENGTH = "focal-length"; private static final String KEY_HORIZONTAL_VIEW_ANGLE = "horizontal-view-angle"; Loading Loading @@ -2759,6 +2759,11 @@ public class Camera { */ public List<String> getSupportedIsoValues() { String str = get(KEY_ISO_MODE + SUPPORTED_VALUES_SUFFIX); if (str == null && get("nv-mode-hint") != null) { /* Support NV cams */ KEY_ISO_MODE = "nv-picture-iso"; str = get(KEY_ISO_MODE + SUPPORTED_VALUES_SUFFIX); } return split(str); } Loading