am 6416f7d2: am 5e27ea67: am 3b690f25: Merge "camera2: (Legacy) Add control.sceneMode = DISABLED to templates" into lmp-dev

* commit '6416f7d221b462542f5df0128201b1da6b206933': camera2: (Legacy) Add control.sceneMode = DISABLED to templates
2014-08-19 18:59:35 +00:00
parent 7639f78aee fcfa4c9506
commit 36dcda4505
1 changed files with 3 additions and 0 deletions
--- a/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java
+++ b/core/java/android/hardware/camera2/legacy/LegacyMetadataMapper.java
@@ -1207,6 +1207,9 @@ public class LegacyMetadataMapper {
            m.set(CaptureRequest.CONTROL_AE_TARGET_FPS_RANGE, bestRange);
        }

+        // control.sceneMode -- DISABLED is always available
+        m.set(CaptureRequest.CONTROL_SCENE_MODE, CONTROL_SCENE_MODE_DISABLED);
+
        /*
         * statistics.*
         */