Revert "Revert "camera2: Add legacy mode enum to supported hardware level.""

This reverts commit ae137c1786f3f3b30c3e4000da8c033477b1b343.

Change-Id: I19483d6964ee219fa4d33cd297e2d217cf0f230f

diff --git a/camera/docs/docs.html b/camera/docs/docs.html
index e4907b1..4092e37 100644 (file)
--- a/camera/docs/docs.html
+++ b/camera/docs/docs.html
@@ -21396,8 +21396,11 @@ doesn't violate the above rules.<wbr/></p>
                   </li>
                   <li>
                     <span class="entry_type_enum_name">FULL</span>
-                    <span class="entry_type_enum_notes"><p>This camera device is capable of supporting advanced imaging
-applications.<wbr/></p></span>
+                    <span class="entry_type_enum_notes"><p>This camera device is capable of supporting advanced imaging applications.<wbr/></p></span>
+                  </li>
+                  <li>
+                    <span class="entry_type_enum_name">LEGACY</span>
+                    <span class="entry_type_enum_notes"><p>This camera device is running in backward compatibility mode.<wbr/></p></span>
                   </li>
                 </ul>
 
@@ -21438,6 +21441,8 @@ applications.<wbr/></p></span>
 </ul>
 <p>A LIMITED device may have some or none of the above characteristics.<wbr/>
 To find out more refer to <a href="#static_android.request.availableCapabilities">android.<wbr/>request.<wbr/>available<wbr/>Capabilities</a>.<wbr/></p>
+<p>A LEGACY device does not support per-frame control,<wbr/> manual sensor control,<wbr/> manual
+post-processing,<wbr/> arbitrary cropping regions,<wbr/> and has relaxed performance constraints.<wbr/></p>
             </td>
           </tr>
 

diff --git a/camera/docs/metadata_properties.xml b/camera/docs/metadata_properties.xml
index 3704b41..714643a 100644 (file)
--- a/camera/docs/metadata_properties.xml
+++ b/camera/docs/metadata_properties.xml
@@ -6425,12 +6425,24 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
         <entry name="supportedHardwareLevel" type="byte" visibility="public"
                enum="true" >
           <enum>
-            <value>LIMITED
-            <notes>This camera device has only limited capabilities.
-            </notes></value>
-            <value>FULL
-            <notes>This camera device is capable of supporting advanced imaging
-            applications.</notes></value>
+            <value>
+              LIMITED
+              <notes>
+              This camera device has only limited capabilities.
+              </notes>
+            </value>
+            <value>
+              FULL
+              <notes>
+              This camera device is capable of supporting advanced imaging applications.
+              </notes>
+            </value>
+            <value>
+              LEGACY
+              <notes>
+              This camera device is running in backward compatibility mode.
+              </notes>
+            </value>
           </enum>
           <description>
           Generally classifies the overall set of the camera device functionality.
@@ -6453,6 +6465,9 @@ xsi:schemaLocation="http://schemas.android.com/service/camera/metadata/ metadata
 
           A LIMITED device may have some or none of the above characteristics.
           To find out more refer to android.request.availableCapabilities.
+
+          A LEGACY device does not support per-frame control, manual sensor control, manual
+          post-processing, arbitrary cropping regions, and has relaxed performance constraints.
           </details>
           <hal_details>
           The camera 3 HAL device can implement one of two possible

diff --git a/camera/include/system/camera_metadata_tags.h b/camera/include/system/camera_metadata_tags.h
index 8844b5b..abd8e46 100644 (file)
--- a/camera/include/system/camera_metadata_tags.h
+++ b/camera/include/system/camera_metadata_tags.h
@@ -800,6 +800,7 @@ typedef enum camera_metadata_enum_android_led_available_leds {
 typedef enum camera_metadata_enum_android_info_supported_hardware_level {
     ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED,
     ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_FULL,
+    ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY,
 } camera_metadata_enum_android_info_supported_hardware_level_t;
 
 

diff --git a/camera/src/camera_metadata_tag_info.c b/camera/src/camera_metadata_tag_info.c
index b6afa87..055886d 100644 (file)
--- a/camera/src/camera_metadata_tag_info.c
+++ b/camera/src/camera_metadata_tag_info.c
@@ -2234,6 +2234,10 @@ int camera_metadata_enum_snprint(uint32_t tag,
                     msg = "FULL";
                     ret = 0;
                     break;
+                case ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_LEGACY:
+                    msg = "LEGACY";
+                    ret = 0;
+                    break;
                 default:
                     msg = "error: enum value out of range";
             }