commit ec48fc717639606662ecedfec7059e9edabe4f2a
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Apr 13 03:02:55 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 13 03:02:56 2017 +0000
tree fbc70b0fd647643107b855b41c8b845dbe2a65ea
parent eda836acb39abba4bd2609005c8e95902d54db1e
parent 4c5e9d1995908cf03aeb91fa5ca0233d1c757fb4

Merge "Mark as vendor_available" into oc-dev

camera/src/camera_metadata.c

diff --git a/camera/src/camera_metadata.c b/camera/src/camera_metadata.c
index 33a2635..c41d69d 100644
--- a/camera/src/camera_metadata.c
+++ b/camera/src/camera_metadata.c
@@ -523,10 +523,12 @@
     if (dst->data_capacity < src->data_count + dst->data_count) return ERROR;
 
     if ((dst->vendor_id != CAMERA_METADATA_INVALID_VENDOR_ID) &&
-            (dst->vendor_id != src->vendor_id)) {
-        ALOGE("%s: Append for metadata from different vendors is "
-                "not supported!", __func__);
-        return ERROR;
+            (src->vendor_id != CAMERA_METADATA_INVALID_VENDOR_ID)) {
+        if (dst->vendor_id != src->vendor_id) {
+            ALOGE("%s: Append for metadata from different vendors is"
+                    "not supported!", __func__);
+            return ERROR;
+        }
     }
 
     memcpy(get_entries(dst) + dst->entry_count, get_entries(src),