camera_metadata: fix int64 enums being mismapped to Integer in API

metadata generation logic wrongly maps all tags that are both int64 and enum
to Integer type in managed code. This created mismatch between native and
managed sides and caused exception when application get the metadata key.

Change-Id: I53a213078d3587522970ca8af46ac28d43eef425

diff --git a/camera/docs/metadata_helpers.py b/camera/docs/metadata_helpers.py
index 14e75cc..43de00c 100644 (file)
--- a/camera/docs/metadata_helpers.py
+++ b/camera/docs/metadata_helpers.py
@@ -382,8 +382,8 @@ def jtype_unboxed(entry):
       java_type = typedef_name # already takes into account arrays
 
   if not java_type:
-    if not java_type and entry.enum:
-      # Always map enums to Java ints, unless there's a typedef override
+    if not java_type and entry.enum and metadata_type == 'byte':
+      # Always map byte enums to Java ints, unless there's a typedef override
       base_type = 'int'
 
     else: