commit 87dcd9c18852b1623387d1ff413438ab8d30516f
author Itaru Hanada <itaru.x.hanada@sonymobile.com> Tue Jul 28 21:36:31 2015 +0900
committer John Eckerdal <john.eckerdal@sonymobile.com> Wed Aug 26 13:17:12 2015 +0200
tree 4c0a24088893800a1b0e8820a38541f869f08b5f
parent 86f2ec1a03053d89e3341ae8ccc22754e504f005

Fix error in the limited mode for ITS

Documentation states that limited mode
should not provide certain metadata.
Therefore, modified to check the following metadata
with appropriate capabilities or available keys.

-android.sensor.frameDuration
-android.sensor.exposureTime
-android.sensor.sensitivity
-android.hotPixel.availableHotPixelModes
-android.hotPixel.mode
-android.edge.availableEdgeModes
-android.edge.mode

Change-Id: I372b03e245c996667fe2a550663849bb29fc8f44

apps/CameraITS/pymodules/its/objects.py

diff --git a/apps/CameraITS/pymodules/its/objects.py b/apps/CameraITS/pymodules/its/objects.py
index 22540b8..e1541a1 100644
--- a/apps/CameraITS/pymodules/its/objects.py
+++ b/apps/CameraITS/pymodules/its/objects.py
@@ -195,12 +195,20 @@
     set_filter_off_or_fast_if_possible(props, req,
         "android.colorCorrection.availableAberrationModes",
         "android.colorCorrection.aberrationMode")
-    set_filter_off_or_fast_if_possible(props, req,
-        "android.hotPixel.availableHotPixelModes",
-        "android.hotPixel.mode")
-    set_filter_off_or_fast_if_possible(props, req,
-        "android.edge.availableEdgeModes",
-        "android.edge.mode")
+    if props.has_key("android.request.availableCharacteristicsKeys"):
+        hot_pixel_modes = 393217 in props["android.request.availableCharacteristicsKeys"]
+        edge_modes = 196610 in props["android.request.availableCharacteristicsKeys"]
+    if props.has_key("android.request.availableRequestKeys"):
+        hot_pixel_mode = 393216 in props["android.request.availableRequestKeys"]
+        edge_mode = 196608 in props["android.request.availableRequestKeys"]
+    if hot_pixel_modes and hot_pixel_mode:
+        set_filter_off_or_fast_if_possible(props, req,
+            "android.hotPixel.availableHotPixelModes",
+            "android.hotPixel.mode")
+    if edge_modes and edge_mode:
+        set_filter_off_or_fast_if_possible(props, req,
+            "android.edge.availableEdgeModes",
+            "android.edge.mode")
 
 def get_fastest_manual_capture_settings(props):
     """Return a capture request and format spec for the fastest capture.