Merge "camera2: (Legacy) Add control.sceneMode = DISABLED to templates" into lmp-dev

2014-08-19 18:34:56 +00:00
parent d504ab14d2 981952d07a
commit ae0da7a81c
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.*
         */