commit 2fb6eefdfb58e1cedff8e9cdf577ed9f1ad6469f
author zhangkai <mail.zhangkai@gmail.com> Sat Jul 18 00:26:57 2020 +0800
committer Emilian Peev <epeev@google.com> Mon Aug 17 12:44:57 2020 -0700
tree 0bb12ea05fe1eddb273367eb19800bc54b767fc1
parent ba6ebdbb9215d1f5666a72a7c9c2ec1135c27048

Fix null pointer exception if partial meta doesn't include some keys

Partial meta may don't have CaptureResult.CONTROL_AE_STATE key set.
In this case, crash happens at onCaptureProgressed(DngCreatorTest.java:734)

Bug: 161734727

Test: android.hardware.camera2.cts.DngCreatorTest#testDngRenderingByBitmapFactor
Change-Id: Ie730b070f4a7a127be9245ef36baf52efc827550

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

diff --git a/tests/camera/src/android/hardware/camera2/cts/DngCreatorTest.java b/tests/camera/src/android/hardware/camera2/cts/DngCreatorTest.java
index b0c806f..84da4ee 100644
--- a/tests/camera/src/android/hardware/camera2/cts/DngCreatorTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/DngCreatorTest.java
@@ -735,9 +735,10 @@
                 @Override
                 public void onCaptureProgressed(CameraCaptureSession session,
                         CaptureRequest request, CaptureResult partialResult) {
-                    int aeState = partialResult.get(CaptureResult.CONTROL_AE_STATE);
-                    if (aeState == CaptureRequest.CONTROL_AE_STATE_CONVERGED ||
-                            aeState == CaptureRequest.CONTROL_AE_STATE_FLASH_REQUIRED) {
+                    Integer aeState = partialResult.get(CaptureResult.CONTROL_AE_STATE);
+                    if (aeState != null &&
+                            (aeState == CaptureRequest.CONTROL_AE_STATE_CONVERGED ||
+                             aeState == CaptureRequest.CONTROL_AE_STATE_FLASH_REQUIRED)) {
                         waitForAeCondition.open();
                     }
                 }