QCamera2: Remove undefined entries from metadata union
Bug: 14028116
Change-Id: Ia6037b4e641996c77105562e019612b657e08cdc
diff --git a/camera/QCamera2/stack/common/cam_intf.h b/camera/QCamera2/stack/common/cam_intf.h
index a9fcd82..197976c 100755
--- a/camera/QCamera2/stack/common/cam_intf.h
+++ b/camera/QCamera2/stack/common/cam_intf.h
@@ -500,10 +500,7 @@
INCLUDE(CAM_INTF_META_LENS_FOCUS_RANGE, float, 2);
INCLUDE(CAM_INTF_META_LENS_STATE, uint8_t, 1);
INCLUDE(CAM_INTF_META_LENS_OPT_STAB_MODE, uint8_t, 1);
- INCLUDE(CAM_INTF_META_LENS_FOCUS_STATE, uint8_t, 1);
INCLUDE(CAM_INTF_META_NOISE_REDUCTION_MODE, uint8_t, 1);
- INCLUDE(CAM_INTF_META_QUIRKS_PARTIAL_RESULT, uint8_t, 1);
- INCLUDE(CAM_INTF_META_REQUEST_ID, uint8_t, 1);
INCLUDE(CAM_INTF_META_SCALER_CROP_REGION, cam_crop_region_t, 1);
INCLUDE(CAM_INTF_META_SENSOR_EXPOSURE_TIME, int64_t, 1);
INCLUDE(CAM_INTF_META_SENSOR_FRAME_DURATION, int64_t, 1);
diff --git a/camera/QCamera2/stack/common/cam_types.h b/camera/QCamera2/stack/common/cam_types.h
index 9174303..4498efa 100644
--- a/camera/QCamera2/stack/common/cam_types.h
+++ b/camera/QCamera2/stack/common/cam_types.h
@@ -942,7 +942,6 @@
/*The best fit color channels gains calculated by the stats*/
CAM_INTF_META_PRED_COLOR_CORRECT_GAINS,
/* CONTROL */
-// CAM_INTF_META_REQUEST_ID,
/* A frame counter set by the framework. Must be maintained unchanged in
* output frame. */
CAM_INTF_META_FRAME_NUMBER,
