OSDN Git Service

Merge "Camera: Generate HIDL metadata modules"
authorTreeHugger Robot <treehugger-gerrit@google.com>
Sat, 9 Dec 2017 00:10:34 +0000 (00:10 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Sat, 9 Dec 2017 00:10:34 +0000 (00:10 +0000)
1  2 
camera/include/system/camera_metadata_tags.h

@@@ -161,10 -161,9 +161,10 @@@ typedef enum camera_metadata_tag 
      ANDROID_CONTROL_POST_RAW_SENSITIVITY_BOOST_RANGE, // int32[]      | public       | HIDL v3.2
      ANDROID_CONTROL_POST_RAW_SENSITIVITY_BOOST,       // int32        | public       | HIDL v3.2
      ANDROID_CONTROL_ENABLE_ZSL,                       // enum         | public       | HIDL v3.2
 +    ANDROID_CONTROL_AF_SCENE_CHANGE,                  // enum         | public       | HIDL v3.3
      ANDROID_CONTROL_END,
  
-     ANDROID_DEMOSAIC_MODE =                           // enum         | system
+     ANDROID_DEMOSAIC_MODE =                           // enum         | system       | HIDL v3.2
              ANDROID_DEMOSAIC_START,
      ANDROID_DEMOSAIC_END,