commit fdd8b288746ff2ed8a167f7119e72cf47ca5da58
author Yin-Chia Yeh <yinchiayeh@google.com> Fri Apr 14 19:06:51 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Apr 14 19:06:51 2017 +0000
tree e0c40f8c02807b483e0c57a5c211fbb4d4acecd4
parent a067b00e5afa78dcfa311d2820cb5d6c44e3fb87
parent 7d50d140d735af436a094ae7c81d645aaece59d3

Merge "Camera: fix exposure value calculation" into nougat-cts-dev
am: 7d50d140d7

Change-Id: Ibaf7495ca6765eb68f00ea6a170956b5e2f9c25c

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

diff --git a/tests/camera/src/android/hardware/camera2/cts/StillCaptureTest.java b/tests/camera/src/android/hardware/camera2/cts/StillCaptureTest.java
index a9b4ad2..037074c 100644
--- a/tests/camera/src/android/hardware/camera2/cts/StillCaptureTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/StillCaptureTest.java
@@ -1165,7 +1165,11 @@
     private long getExposureValue(CaptureResult result) throws Exception {
         int expTimeUs = (int) (getValueNotNull(result, CaptureResult.SENSOR_EXPOSURE_TIME) / 1000);
         int sensitivity = getValueNotNull(result, CaptureResult.SENSOR_SENSITIVITY);
-        return expTimeUs * sensitivity;
+        Integer postRawSensitivity = result.get(CaptureResult.CONTROL_POST_RAW_SENSITIVITY_BOOST);
+        if (postRawSensitivity != null) {
+            return (long) sensitivity * postRawSensitivity / 100 * expTimeUs;
+        }
+        return (long) sensitivity * expTimeUs;
     }
 
     private long getMaxExposureValue(CaptureRequest.Builder request, long maxExposureTimeUs,