OSDN Git Service

camera: Correct 'availableSessionKeys' version
authorEmilian Peev <epeev@google.com>
Wed, 10 Jan 2018 13:47:40 +0000 (13:47 +0000)
committerEmilian Peev <epeev@google.com>
Wed, 10 Jan 2018 13:51:47 +0000 (13:51 +0000)
The hal version of 'availableSessionKeys' should be 3.3 not 3.4 .

Bug: 64450664
Test: Builds, hidl-gen/hidl-doc are happy with the HIDL output
Change-Id: I2af918362de4e5e405a50d202ba400b501d404d0

camera/docs/docs.html
camera/docs/metadata_definitions.xml
camera/include/system/camera_metadata_tags.h

index f187945..b81d26f 100644 (file)
@@ -17204,7 +17204,7 @@ can pass as part of the capture session initialization.<wbr/></p>
             </td>
 
             <td class="entry_hal_version">
-              <p>3.<wbr/>4</p>
+              <p>3.<wbr/>3</p>
             </td>
 
             <td class="entry_tags">
index 230ef05..20a357b 100644 (file)
@@ -5292,7 +5292,7 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
           </hal_details>
         </entry>
         <entry name="availableSessionKeys" type="int32" visibility="ndk_public"
-               container="array" hwlevel="legacy" hal_version="3.4">
+               container="array" hwlevel="legacy" hal_version="3.3">
           <array>
             <size>n</size>
           </array>
index 3e36c7d..1435c6b 100644 (file)
@@ -265,7 +265,7 @@ typedef enum camera_metadata_tag {
     ANDROID_REQUEST_AVAILABLE_REQUEST_KEYS,           // int32[]      | ndk_public   | HIDL v3.2
     ANDROID_REQUEST_AVAILABLE_RESULT_KEYS,            // int32[]      | ndk_public   | HIDL v3.2
     ANDROID_REQUEST_AVAILABLE_CHARACTERISTICS_KEYS,   // int32[]      | ndk_public   | HIDL v3.2
-    ANDROID_REQUEST_AVAILABLE_SESSION_KEYS,           // int32[]      | ndk_public   | HIDL v3.4
+    ANDROID_REQUEST_AVAILABLE_SESSION_KEYS,           // int32[]      | ndk_public   | HIDL v3.3
     ANDROID_REQUEST_END,
 
     ANDROID_SCALER_CROP_REGION =                      // int32[]      | public       | HIDL v3.2