camera-metadata: Fix availableTestPatternModes type

Also fixed the typo in android.control.mode related
with scene mode.

Change-Id: I5e311bac4694e1ccfc8d3210fbf8b40e1b31ecef

diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index fef1523..3643243 100644 (file)
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -2357,8 +2357,9 @@ control.<wbr/>aeMode,<wbr/> control.<wbr/>awbMode and control.<wbr/>afMode
 controls; the camera device will ignore those settings while
 USE_<wbr/>SCENE_<wbr/>MODE is active (except for FACE_<wbr/>PRIORITY
 scene mode).<wbr/> Other control entries are still active.<wbr/>
-This setting can only be used if availableSceneModes !=
-UNSUPPORTED</p></span>
+This setting can only be used if scene mode is supported
+(i.<wbr/>e.<wbr/> <a href="#static_android.control.availableSceneModes">android.<wbr/>control.<wbr/>available<wbr/>Scene<wbr/>Modes</a> contain some modes
+other than DISABLED).<wbr/></p></span>
                   </li>
                   <li>
                     <span class="entry_type_enum_name">OFF_KEEP_STATE</span>
@@ -4877,8 +4878,9 @@ control.<wbr/>aeMode,<wbr/> control.<wbr/>awbMode and control.<wbr/>afMode
 controls; the camera device will ignore those settings while
 USE_<wbr/>SCENE_<wbr/>MODE is active (except for FACE_<wbr/>PRIORITY
 scene mode).<wbr/> Other control entries are still active.<wbr/>
-This setting can only be used if availableSceneModes !=
-UNSUPPORTED</p></span>
+This setting can only be used if scene mode is supported
+(i.<wbr/>e.<wbr/> <a href="#static_android.control.availableSceneModes">android.<wbr/>control.<wbr/>available<wbr/>Scene<wbr/>Modes</a> contain some modes
+other than DISABLED).<wbr/></p></span>
                   </li>
                   <li>
                     <span class="entry_type_enum_name">OFF_KEEP_STATE</span>
@@ -12780,9 +12782,14 @@ element.<wbr/></p>
               android.<wbr/>sensor.<wbr/>available<wbr/>Test<wbr/>Pattern<wbr/>Modes
             </td>
             <td class="entry_type">
-                <span class="entry_type_name">byte</span>
+                <span class="entry_type_name">int32</span>
+                <span class="entry_type_container">x</span>
 
+                <span class="entry_type_array">
+                  n
+                </span>
               <span class="entry_type_visibility"> [public]</span>
+                <div class="entry_type_notes">list of enums</div>
 
 
             </td> <!-- entry_type -->

diff --git a/camera/docs/metadata_properties.xml b/camera/docs/metadata_properties.xml
index ae04384..3a19aee 100644 (file)
--- a/camera/docs/metadata_properties.xml
+++ b/camera/docs/metadata_properties.xml
@@ -899,8 +899,10 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
             controls; the camera device will ignore those settings while
             USE_SCENE_MODE is active (except for FACE_PRIORITY
             scene mode). Other control entries are still active.
-            This setting can only be used if availableSceneModes !=
-            UNSUPPORTED</notes></value>
+            This setting can only be used if scene mode is supported
+            (i.e. android.control.availableSceneModes contain some modes
+            other than DISABLED).
+            </notes></value>
             <value>OFF_KEEP_STATE
             <notes>Same as OFF mode, except that this capture will not be
             used by camera device background auto-exposure, auto-white balance and
@@ -4397,8 +4399,11 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
         </clone>
       </dynamic>
       <static>
-        <entry name="availableTestPatternModes" type="byte" visibility="public"
-          optional="true">
+        <entry name="availableTestPatternModes" type="int32" visibility="public" optional="true"
+          type_notes="list of enums" container="array">
+          <array>
+            <size>n</size>
+          </array>
           <description>Optional. Defaults to [OFF]. Lists the supported test
             pattern modes for android.sensor.testPatternMode.
           </description>

diff --git a/camera/include/system/camera_metadata_tags.h b/camera/include/system/camera_metadata_tags.h
index 863a362..3452761 100644 (file)
--- a/camera/include/system/camera_metadata_tags.h
+++ b/camera/include/system/camera_metadata_tags.h
@@ -285,7 +285,7 @@ typedef enum camera_metadata_tag {
     ANDROID_SENSOR_GREEN_SPLIT,                       // float        | public
     ANDROID_SENSOR_TEST_PATTERN_DATA,                 // int32[]      | public
     ANDROID_SENSOR_TEST_PATTERN_MODE,                 // enum         | public
-    ANDROID_SENSOR_AVAILABLE_TEST_PATTERN_MODES,      // byte         | public
+    ANDROID_SENSOR_AVAILABLE_TEST_PATTERN_MODES,      // int32[]      | public
     ANDROID_SENSOR_END,
 
     ANDROID_SENSOR_INFO_ACTIVE_ARRAY_SIZE =           // int32[]      | public

diff --git a/camera/src/camera_metadata_tag_info.c b/camera/src/camera_metadata_tag_info.c
index 63b0da4..66e3e90 100644 (file)
--- a/camera/src/camera_metadata_tag_info.c
+++ b/camera/src/camera_metadata_tag_info.c
@@ -451,7 +451,7 @@ static tag_info_t android_sensor[ANDROID_SENSOR_END -
     [ ANDROID_SENSOR_TEST_PATTERN_MODE - ANDROID_SENSOR_START ] =
     { "testPatternMode",               TYPE_INT32  },
     [ ANDROID_SENSOR_AVAILABLE_TEST_PATTERN_MODES - ANDROID_SENSOR_START ] =
-    { "availableTestPatternModes",     TYPE_BYTE   },
+    { "availableTestPatternModes",     TYPE_INT32  },
 };
 
 static tag_info_t android_sensor_info[ANDROID_SENSOR_INFO_END -