Snap for 9979206 from 3042508aee59d99ff9b319ad926113ac748d6e86 to sdk-release

Change-Id: I1ad30129bb5ff369b5a8c0e9714c4ee7c344d4fa
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libcamera_metadata.so b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libcamera_metadata.so
index 6aa4a98..dfce044 100755
--- a/arm/arch-arm-armv7-a-neon/shared/vndk-core/libcamera_metadata.so
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-core/libcamera_metadata.so
Binary files differ
diff --git a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libhidlbase.so b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libhidlbase.so
index dedb6ee..13add94 100755
--- a/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libhidlbase.so
+++ b/arm/arch-arm-armv7-a-neon/shared/vndk-sp/libhidlbase.so
Binary files differ
diff --git a/arm/include/system/media/camera/include/system/camera_metadata_tags.h b/arm/include/system/media/camera/include/system/camera_metadata_tags.h
index 7bea4a8..8079d79 100644
--- a/arm/include/system/media/camera/include/system/camera_metadata_tags.h
+++ b/arm/include/system/media/camera/include/system/camera_metadata_tags.h
@@ -382,6 +382,7 @@
     ANDROID_SENSOR_OPAQUE_RAW_SIZE_MAXIMUM_RESOLUTION,// int32[]      | system       | HIDL v3.6
     ANDROID_SENSOR_PIXEL_MODE,                        // enum         | public       | HIDL v3.6
     ANDROID_SENSOR_RAW_BINNING_FACTOR_USED,           // enum         | public       | HIDL v3.6
+    ANDROID_SENSOR_READOUT_TIMESTAMP,                 // enum         | fwk_java_public
     ANDROID_SENSOR_END,
 
     ANDROID_SENSOR_INFO_ACTIVE_ARRAY_SIZE =           // int32[]      | public       | HIDL v3.2
@@ -1100,6 +1101,12 @@
     ANDROID_SENSOR_RAW_BINNING_FACTOR_USED_FALSE                    , // HIDL v3.6
 } camera_metadata_enum_android_sensor_raw_binning_factor_used_t;
 
+// ANDROID_SENSOR_READOUT_TIMESTAMP
+typedef enum camera_metadata_enum_android_sensor_readout_timestamp {
+    ANDROID_SENSOR_READOUT_TIMESTAMP_NOT_SUPPORTED                  ,
+    ANDROID_SENSOR_READOUT_TIMESTAMP_HARDWARE                       ,
+} camera_metadata_enum_android_sensor_readout_timestamp_t;
+
 
 // ANDROID_SENSOR_INFO_COLOR_FILTER_ARRANGEMENT
 typedef enum camera_metadata_enum_android_sensor_info_color_filter_arrangement {
diff --git a/arm64/arch-arm-armv8-a/shared/vndk-core/libcamera_metadata.so b/arm64/arch-arm-armv8-a/shared/vndk-core/libcamera_metadata.so
index f597bfc..1c0a42f 100755
--- a/arm64/arch-arm-armv8-a/shared/vndk-core/libcamera_metadata.so
+++ b/arm64/arch-arm-armv8-a/shared/vndk-core/libcamera_metadata.so
Binary files differ
diff --git a/arm64/arch-arm-armv8-a/shared/vndk-sp/libhidlbase.so b/arm64/arch-arm-armv8-a/shared/vndk-sp/libhidlbase.so
index b2662c6..6a29376 100755
--- a/arm64/arch-arm-armv8-a/shared/vndk-sp/libhidlbase.so
+++ b/arm64/arch-arm-armv8-a/shared/vndk-sp/libhidlbase.so
Binary files differ
diff --git a/arm64/arch-arm64-armv8-a/shared/vndk-core/libcamera_metadata.so b/arm64/arch-arm64-armv8-a/shared/vndk-core/libcamera_metadata.so
index 6bf0ec6..17b1e62 100755
--- a/arm64/arch-arm64-armv8-a/shared/vndk-core/libcamera_metadata.so
+++ b/arm64/arch-arm64-armv8-a/shared/vndk-core/libcamera_metadata.so
Binary files differ
diff --git a/arm64/arch-arm64-armv8-a/shared/vndk-sp/libhidlbase.so b/arm64/arch-arm64-armv8-a/shared/vndk-sp/libhidlbase.so
index 524d908..7b91219 100755
--- a/arm64/arch-arm64-armv8-a/shared/vndk-sp/libhidlbase.so
+++ b/arm64/arch-arm64-armv8-a/shared/vndk-sp/libhidlbase.so
Binary files differ
diff --git a/arm64/include/system/media/camera/include/system/camera_metadata_tags.h b/arm64/include/system/media/camera/include/system/camera_metadata_tags.h
index 7bea4a8..8079d79 100644
--- a/arm64/include/system/media/camera/include/system/camera_metadata_tags.h
+++ b/arm64/include/system/media/camera/include/system/camera_metadata_tags.h
@@ -382,6 +382,7 @@
     ANDROID_SENSOR_OPAQUE_RAW_SIZE_MAXIMUM_RESOLUTION,// int32[]      | system       | HIDL v3.6
     ANDROID_SENSOR_PIXEL_MODE,                        // enum         | public       | HIDL v3.6
     ANDROID_SENSOR_RAW_BINNING_FACTOR_USED,           // enum         | public       | HIDL v3.6
+    ANDROID_SENSOR_READOUT_TIMESTAMP,                 // enum         | fwk_java_public
     ANDROID_SENSOR_END,
 
     ANDROID_SENSOR_INFO_ACTIVE_ARRAY_SIZE =           // int32[]      | public       | HIDL v3.2
@@ -1100,6 +1101,12 @@
     ANDROID_SENSOR_RAW_BINNING_FACTOR_USED_FALSE                    , // HIDL v3.6
 } camera_metadata_enum_android_sensor_raw_binning_factor_used_t;
 
+// ANDROID_SENSOR_READOUT_TIMESTAMP
+typedef enum camera_metadata_enum_android_sensor_readout_timestamp {
+    ANDROID_SENSOR_READOUT_TIMESTAMP_NOT_SUPPORTED                  ,
+    ANDROID_SENSOR_READOUT_TIMESTAMP_HARDWARE                       ,
+} camera_metadata_enum_android_sensor_readout_timestamp_t;
+
 
 // ANDROID_SENSOR_INFO_COLOR_FILTER_ARRANGEMENT
 typedef enum camera_metadata_enum_android_sensor_info_color_filter_arrangement {
diff --git a/x86/arch-x86/shared/vndk-core/libcamera_metadata.so b/x86/arch-x86/shared/vndk-core/libcamera_metadata.so
index f60a64d..7cf39de 100755
--- a/x86/arch-x86/shared/vndk-core/libcamera_metadata.so
+++ b/x86/arch-x86/shared/vndk-core/libcamera_metadata.so
Binary files differ
diff --git a/x86/arch-x86/shared/vndk-sp/libhidlbase.so b/x86/arch-x86/shared/vndk-sp/libhidlbase.so
index 0be54e0..abe08ed 100755
--- a/x86/arch-x86/shared/vndk-sp/libhidlbase.so
+++ b/x86/arch-x86/shared/vndk-sp/libhidlbase.so
Binary files differ
diff --git a/x86/include/system/media/camera/include/system/camera_metadata_tags.h b/x86/include/system/media/camera/include/system/camera_metadata_tags.h
index 7bea4a8..8079d79 100644
--- a/x86/include/system/media/camera/include/system/camera_metadata_tags.h
+++ b/x86/include/system/media/camera/include/system/camera_metadata_tags.h
@@ -382,6 +382,7 @@
     ANDROID_SENSOR_OPAQUE_RAW_SIZE_MAXIMUM_RESOLUTION,// int32[]      | system       | HIDL v3.6
     ANDROID_SENSOR_PIXEL_MODE,                        // enum         | public       | HIDL v3.6
     ANDROID_SENSOR_RAW_BINNING_FACTOR_USED,           // enum         | public       | HIDL v3.6
+    ANDROID_SENSOR_READOUT_TIMESTAMP,                 // enum         | fwk_java_public
     ANDROID_SENSOR_END,
 
     ANDROID_SENSOR_INFO_ACTIVE_ARRAY_SIZE =           // int32[]      | public       | HIDL v3.2
@@ -1100,6 +1101,12 @@
     ANDROID_SENSOR_RAW_BINNING_FACTOR_USED_FALSE                    , // HIDL v3.6
 } camera_metadata_enum_android_sensor_raw_binning_factor_used_t;
 
+// ANDROID_SENSOR_READOUT_TIMESTAMP
+typedef enum camera_metadata_enum_android_sensor_readout_timestamp {
+    ANDROID_SENSOR_READOUT_TIMESTAMP_NOT_SUPPORTED                  ,
+    ANDROID_SENSOR_READOUT_TIMESTAMP_HARDWARE                       ,
+} camera_metadata_enum_android_sensor_readout_timestamp_t;
+
 
 // ANDROID_SENSOR_INFO_COLOR_FILTER_ARRANGEMENT
 typedef enum camera_metadata_enum_android_sensor_info_color_filter_arrangement {
diff --git a/x86_64/arch-x86-x86_64/shared/vndk-core/libcamera_metadata.so b/x86_64/arch-x86-x86_64/shared/vndk-core/libcamera_metadata.so
index 7e001e8..5451c2b 100755
--- a/x86_64/arch-x86-x86_64/shared/vndk-core/libcamera_metadata.so
+++ b/x86_64/arch-x86-x86_64/shared/vndk-core/libcamera_metadata.so
Binary files differ
diff --git a/x86_64/arch-x86-x86_64/shared/vndk-sp/libhidlbase.so b/x86_64/arch-x86-x86_64/shared/vndk-sp/libhidlbase.so
index 4d3589b..212a2ac 100755
--- a/x86_64/arch-x86-x86_64/shared/vndk-sp/libhidlbase.so
+++ b/x86_64/arch-x86-x86_64/shared/vndk-sp/libhidlbase.so
Binary files differ
diff --git a/x86_64/arch-x86_64/shared/vndk-core/libcamera_metadata.so b/x86_64/arch-x86_64/shared/vndk-core/libcamera_metadata.so
index dfb3414..3ef5b00 100755
--- a/x86_64/arch-x86_64/shared/vndk-core/libcamera_metadata.so
+++ b/x86_64/arch-x86_64/shared/vndk-core/libcamera_metadata.so
Binary files differ
diff --git a/x86_64/arch-x86_64/shared/vndk-sp/libhidlbase.so b/x86_64/arch-x86_64/shared/vndk-sp/libhidlbase.so
index 8e0884f..fd26b13 100755
--- a/x86_64/arch-x86_64/shared/vndk-sp/libhidlbase.so
+++ b/x86_64/arch-x86_64/shared/vndk-sp/libhidlbase.so
Binary files differ
diff --git a/x86_64/include/system/media/camera/include/system/camera_metadata_tags.h b/x86_64/include/system/media/camera/include/system/camera_metadata_tags.h
index 7bea4a8..8079d79 100644
--- a/x86_64/include/system/media/camera/include/system/camera_metadata_tags.h
+++ b/x86_64/include/system/media/camera/include/system/camera_metadata_tags.h
@@ -382,6 +382,7 @@
     ANDROID_SENSOR_OPAQUE_RAW_SIZE_MAXIMUM_RESOLUTION,// int32[]      | system       | HIDL v3.6
     ANDROID_SENSOR_PIXEL_MODE,                        // enum         | public       | HIDL v3.6
     ANDROID_SENSOR_RAW_BINNING_FACTOR_USED,           // enum         | public       | HIDL v3.6
+    ANDROID_SENSOR_READOUT_TIMESTAMP,                 // enum         | fwk_java_public
     ANDROID_SENSOR_END,
 
     ANDROID_SENSOR_INFO_ACTIVE_ARRAY_SIZE =           // int32[]      | public       | HIDL v3.2
@@ -1100,6 +1101,12 @@
     ANDROID_SENSOR_RAW_BINNING_FACTOR_USED_FALSE                    , // HIDL v3.6
 } camera_metadata_enum_android_sensor_raw_binning_factor_used_t;
 
+// ANDROID_SENSOR_READOUT_TIMESTAMP
+typedef enum camera_metadata_enum_android_sensor_readout_timestamp {
+    ANDROID_SENSOR_READOUT_TIMESTAMP_NOT_SUPPORTED                  ,
+    ANDROID_SENSOR_READOUT_TIMESTAMP_HARDWARE                       ,
+} camera_metadata_enum_android_sensor_readout_timestamp_t;
+
 
 // ANDROID_SENSOR_INFO_COLOR_FILTER_ARRANGEMENT
 typedef enum camera_metadata_enum_android_sensor_info_color_filter_arrangement {