Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64f39ae2 authored by Austin Borger's avatar Austin Borger Committed by Android (Google) Code Review
Browse files

Merge "Update AIDL files accidentally diverged from HIDL / libcamera_metadata." into tm-dev

parents 4fc77b01 c31af39e

camera/metadata/aidl/aidl_api/android.hardware.camera.metadata/current/android/hardware/camera/metadata/CameraMetadataTag.aidl

+9 −8
Original line number Diff line number Diff line
@@ -188,14 +188,15 @@ enum CameraMetadataTag { 
  ANDROID_SCALER_AVAILABLE_RECOMMENDED_STREAM_CONFIGURATIONS = 851982,

  ANDROID_SCALER_AVAILABLE_RECOMMENDED_INPUT_OUTPUT_FORMATS_MAP = 851983,

  ANDROID_SCALER_AVAILABLE_ROTATE_AND_CROP_MODES = 851984,

  ANDROID_SCALER_DEFAULT_SECURE_IMAGE_SIZE = 851985,

  ANDROID_SCALER_PHYSICAL_CAMERA_MULTI_RESOLUTION_STREAM_CONFIGURATIONS = 851986,

  ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_MAXIMUM_RESOLUTION = 851987,

  ANDROID_SCALER_AVAILABLE_MIN_FRAME_DURATIONS_MAXIMUM_RESOLUTION = 851988,

  ANDROID_SCALER_AVAILABLE_STALL_DURATIONS_MAXIMUM_RESOLUTION = 851989,

  ANDROID_SCALER_AVAILABLE_INPUT_OUTPUT_FORMATS_MAP_MAXIMUM_RESOLUTION = 851990,

  ANDROID_SCALER_MULTI_RESOLUTION_STREAM_SUPPORTED = 851991,

  ANDROID_SCALER_AVAILABLE_STREAM_USE_CASES = 851992,

  ANDROID_SCALER_ROTATE_AND_CROP = 851985,

  ANDROID_SCALER_DEFAULT_SECURE_IMAGE_SIZE = 851986,

  ANDROID_SCALER_PHYSICAL_CAMERA_MULTI_RESOLUTION_STREAM_CONFIGURATIONS = 851987,

  ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_MAXIMUM_RESOLUTION = 851988,

  ANDROID_SCALER_AVAILABLE_MIN_FRAME_DURATIONS_MAXIMUM_RESOLUTION = 851989,

  ANDROID_SCALER_AVAILABLE_STALL_DURATIONS_MAXIMUM_RESOLUTION = 851990,

  ANDROID_SCALER_AVAILABLE_INPUT_OUTPUT_FORMATS_MAP_MAXIMUM_RESOLUTION = 851991,

  ANDROID_SCALER_MULTI_RESOLUTION_STREAM_SUPPORTED = 851992,

  ANDROID_SCALER_AVAILABLE_STREAM_USE_CASES = 851994,

  ANDROID_SENSOR_EXPOSURE_TIME = 917504,

  ANDROID_SENSOR_FRAME_DURATION = 917505,

  ANDROID_SENSOR_SENSITIVITY = 917506,

camera/metadata/aidl/aidl_api/android.hardware.camera.metadata/current/android/hardware/camera/metadata/RequestAvailableCapabilities.aidl

+1 −0
Original line number Diff line number Diff line
@@ -57,4 +57,5 @@ enum RequestAvailableCapabilities { 
  ANDROID_REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR = 16,

  ANDROID_REQUEST_AVAILABLE_CAPABILITIES_REMOSAIC_REPROCESSING = 17,

  ANDROID_REQUEST_AVAILABLE_CAPABILITIES_DYNAMIC_RANGE_TEN_BIT = 18,

  ANDROID_REQUEST_AVAILABLE_CAPABILITIES_STREAM_USE_CASE = 19,

}

camera/metadata/aidl/aidl_api/android.hardware.camera.metadata/current/android/hardware/camera/metadata/SensorTestPatternMode.aidl

+1 −1
Original line number Diff line number Diff line
@@ -43,6 +43,6 @@ enum SensorTestPatternMode { 
  ANDROID_SENSOR_TEST_PATTERN_MODE_COLOR_BARS = 2,

  ANDROID_SENSOR_TEST_PATTERN_MODE_COLOR_BARS_FADE_TO_GRAY = 3,

  ANDROID_SENSOR_TEST_PATTERN_MODE_PN9 = 4,

  ANDROID_SENSOR_TEST_PATTERN_MODE_BLACK = 5,

  ANDROID_SENSOR_TEST_PATTERN_MODE_CUSTOM1 = 256,

  ANDROID_SENSOR_TEST_PATTERN_MODE_BLACK = 257,

}

camera/metadata/aidl/android/hardware/camera/metadata/AutomotiveLensFacing.aidl

+2 −1
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ 


package android.hardware.camera.metadata;



/** android.automotive.lens.facing enumeration values

/**

 * android.automotive.lens.facing enumeration values

 * @see ANDROID_AUTOMOTIVE_LENS_FACING

 */

@VintfStability

camera/metadata/aidl/android/hardware/camera/metadata/AutomotiveLocation.aidl

+2 −1
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ 


package android.hardware.camera.metadata;



/** android.automotive.location enumeration values

/**

 * android.automotive.location enumeration values

 * @see ANDROID_AUTOMOTIVE_LOCATION

 */

@VintfStability