commit db860fc6168962b461b189d683752984301a8132
author Shuzhen Wang <shuzhenwang@google.com> Mon Jul 11 12:37:43 2016 -0700
committer Shuzhen Wang <shuzhenwang@google.com> Tue Jul 12 17:08:19 2016 -0700
tree 5a831ab1d6c097a67826a380a761b9bf8f0a61ee
parent 62d4c8a379b889ff0daeb7a9a27e0057e044501c

Camera2: Consider POST_RAW_SENSITIVITY_BOOST for EXIF ISO

Bug: 29268533
Change-Id: Ib12a8d5a29b6f28252b2f51b3cc5d1afaf4ec2b5

tests/camera/src/android/hardware/camera2/cts/CameraTestUtils.java

diff --git a/tests/camera/src/android/hardware/camera2/cts/CameraTestUtils.java b/tests/camera/src/android/hardware/camera2/cts/CameraTestUtils.java
index cdca29b..0de3ae6 100644
--- a/tests/camera/src/android/hardware/camera2/cts/CameraTestUtils.java
+++ b/tests/camera/src/android/hardware/camera2/cts/CameraTestUtils.java
@@ -2179,8 +2179,16 @@
 
         // TAG_ISO
         int iso = exif.getAttributeInt(ExifInterface.TAG_ISO, /*defaultValue*/-1);
-        if (staticInfo.areKeysAvailable(CaptureResult.SENSOR_SENSITIVITY)) {
-            int expectedIso = result.get(CaptureResult.SENSOR_SENSITIVITY);
+        if (staticInfo.areKeysAvailable(CaptureResult.SENSOR_SENSITIVITY) ||
+                staticInfo.areKeysAvailable(CaptureResult.CONTROL_POST_RAW_SENSITIVITY_BOOST)) {
+            int expectedIso = 100;
+            if (staticInfo.areKeysAvailable(CaptureResult.SENSOR_SENSITIVITY)) {
+                expectedIso = result.get(CaptureResult.SENSOR_SENSITIVITY);
+            }
+            if (staticInfo.areKeysAvailable(CaptureResult.CONTROL_POST_RAW_SENSITIVITY_BOOST)) {
+                expectedIso = expectedIso *
+                        result.get(CaptureResult.CONTROL_POST_RAW_SENSITIVITY_BOOST) / 100;
+            }
             collector.expectEquals("Exif TAG_ISO is incorrect", expectedIso, iso);
         }