diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-09-11 11:25:50 -0700 |
|---|---|---|
| committer | Eino-Ville Talvala <etalvala@google.com> | 2012-09-11 11:34:59 -0700 |
| commit | 7cfd7d5b65b725d7253295becfe02f03767c71fa (patch) | |
| tree | ee8f0a56e9b2d6772db5507c096130abea82bbd4 | |
| parent | da2f0ea10822628875a956e4bf096066c0debe9f (diff) | |
| download | frameworks_base-7cfd7d5b65b725d7253295becfe02f03767c71fa.zip frameworks_base-7cfd7d5b65b725d7253295becfe02f03767c71fa.tar.gz frameworks_base-7cfd7d5b65b725d7253295becfe02f03767c71fa.tar.bz2 | |
NEW_API: Unhide android.hardware.Camera.Parameters#SCENE_MODE_HDR
Bug: 7054970
Change-Id: I509fa18f1203022bb23cd9ef5c70cb3a3fbb8b77
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/hardware/Camera.java | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index c1d8c9e..e159609 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 e0cf32c..77936c2 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"; |