commit a7503b901490feb476a98eb4b6e138c4a43039bc
author Emilian Peev <epeev@google.com> Mon Aug 13 12:46:05 2018 +0100
committer Emilian Peev <epeev@google.com> Mon Aug 13 13:03:49 2018 +0100
tree bad03f22c04fd72640a3c675b6c7a3e3794b2a34
parent f989a15ed89774ec40ec2562541806212a70e526

DngCreator: Avoid moving absent tag entries

Tags 'TAG_OPCODELIST2' and 'TAG_OPCODELIST3' could be
absent from the main image IFD. Check for their presence
first before moving in the thumbnail sub IFD.

Bug: 112526551
Test: Camera CTS
Change-Id: I7039a533777ca95524d4c7d586ca4b40739cd2e5

core/jni/android_hardware_camera2_DngCreator.cpp

diff --git a/core/jni/android_hardware_camera2_DngCreator.cpp b/core/jni/android_hardware_camera2_DngCreator.cpp
index b1bb555..c977437 100644
--- a/core/jni/android_hardware_camera2_DngCreator.cpp
+++ b/core/jni/android_hardware_camera2_DngCreator.cpp
@@ -1971,8 +1971,14 @@
         tagsToMove.add(TAG_DEFAULTSCALE);
         tagsToMove.add(TAG_DEFAULTCROPORIGIN);
         tagsToMove.add(TAG_DEFAULTCROPSIZE);
-        tagsToMove.add(TAG_OPCODELIST2);
-        tagsToMove.add(TAG_OPCODELIST3);
+
+        if (nullptr != writer->getEntry(TAG_OPCODELIST2, TIFF_IFD_0).get()) {
+            tagsToMove.add(TAG_OPCODELIST2);
+        }
+
+        if (nullptr != writer->getEntry(TAG_OPCODELIST3, TIFF_IFD_0).get()) {
+            tagsToMove.add(TAG_OPCODELIST3);
+        }
 
         if (moveEntries(writer, TIFF_IFD_0, TIFF_IFD_SUB1, tagsToMove) != OK) {
             jniThrowException(env, "java/lang/IllegalStateException", "Failed to move entries");