camera_metadata: Fix availableCapabilities incorrect type

Bug: 15168075
Change-Id: I50553d740101b7db1b7695344bf4cdf9c5cd1cf9

diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index 286a82f..ff4728c 100644 (file)
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -12210,7 +12210,11 @@ the metadata via later partial results.<wbr/></p>
             </td>
             <td class="entry_type">
                 <span class="entry_type_name entry_type_name_enum">byte</span>
+                <span class="entry_type_container">x</span>
 
+                <span class="entry_type_array">
+                  n
+                </span>
               <span class="entry_type_visibility"> [public]</span>
 
 

diff --git a/camera/docs/metadata_properties.xml b/camera/docs/metadata_properties.xml
index 865613d..9ce7294 100644 (file)
--- a/camera/docs/metadata_properties.xml
+++ b/camera/docs/metadata_properties.xml
@@ -3106,7 +3106,10 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           </details>
         </entry>
         <entry name="availableCapabilities" type="byte" visibility="public"
-          enum="true">
+          enum="true" container="array">
+          <array>
+            <size>n</size>
+          </array>
           <enum>
             <value>BACKWARD_COMPATIBLE
               <notes>The minimal set of capabilities that every camera

diff --git a/camera/include/system/camera_metadata_tags.h b/camera/include/system/camera_metadata_tags.h
index 9b47557..dd8aaf3 100644 (file)
--- a/camera/include/system/camera_metadata_tags.h
+++ b/camera/include/system/camera_metadata_tags.h
@@ -242,7 +242,7 @@ typedef enum camera_metadata_tag {
     ANDROID_REQUEST_PIPELINE_DEPTH,                   // byte         | public
     ANDROID_REQUEST_PIPELINE_MAX_DEPTH,               // byte         | public
     ANDROID_REQUEST_PARTIAL_RESULT_COUNT,             // int32        | public
-    ANDROID_REQUEST_AVAILABLE_CAPABILITIES,           // enum         | public
+    ANDROID_REQUEST_AVAILABLE_CAPABILITIES,           // enum[]       | public
     ANDROID_REQUEST_AVAILABLE_REQUEST_KEYS,           // int32[]      | hidden
     ANDROID_REQUEST_AVAILABLE_RESULT_KEYS,            // int32[]      | hidden
     ANDROID_REQUEST_AVAILABLE_CHARACTERISTICS_KEYS,   // int32[]      | hidden