summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--api/current.txt1
-rw-r--r--core/java/android/hardware/Camera.java1
2 files changed, 1 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt
index 1e3e2bb..b3af9f9 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -9865,6 +9865,7 @@ package android.hardware {
field public static final java.lang.String SCENE_MODE_BEACH = "beach";
field public static final java.lang.String SCENE_MODE_CANDLELIGHT = "candlelight";
field public static final java.lang.String SCENE_MODE_FIREWORKS = "fireworks";
+ field public static final java.lang.String SCENE_MODE_HDR = "hdr";
field public static final java.lang.String SCENE_MODE_LANDSCAPE = "landscape";
field public static final java.lang.String SCENE_MODE_NIGHT = "night";
field public static final java.lang.String SCENE_MODE_NIGHT_PORTRAIT = "night-portrait";
diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java
index 7a941b8..08e0ebe 100644
--- a/core/java/android/hardware/Camera.java
+++ b/core/java/android/hardware/Camera.java
@@ -1811,7 +1811,6 @@ public class Camera {
* camera will return an image that has an extended dynamic range
* compared to a regular capture. Capturing such an image may take
* longer than a regular capture.
- * @hide
*/
public static final String SCENE_MODE_HDR = "hdr";