From 7cfd7d5b65b725d7253295becfe02f03767c71fa Mon Sep 17 00:00:00 2001 From: Eino-Ville Talvala Date: Tue, 11 Sep 2012 11:25:50 -0700 Subject: [PATCH] NEW_API: Unhide android.hardware.Camera.Parameters#SCENE_MODE_HDR Bug: 7054970 Change-Id: I509fa18f1203022bb23cd9ef5c70cb3a3fbb8b77 --- api/current.txt | 1 + core/java/android/hardware/Camera.java | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/api/current.txt b/api/current.txt index c1d8c9e86ee3e..e159609e22868 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 e0cf32ce188c6..77936c23b14c7 100644 --- a/core/java/android/hardware/Camera.java +++ b/core/java/android/hardware/Camera.java @@ -1786,7 +1786,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";