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

Commit 5b02e9f6 authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Android Git Automerger
Browse files

am a4aad3d0: Merge changes Ia0f54124,I1e085f5e,Ic0a3ff0a,I141847df,I8ae4efa2 into lmp-preview-dev 

* commit 'a4aad3d0e5c258d6bbf6254ec5ab80a470b1b529':
  camera2: Update native/managed key mappings.
  Camera2: switch API interface to java classses
  Camera2: Use ColorSpaceTransform and RggbChannelVector, replace enum byte[]
  camera2: Add new metadata keys, change types for existing range keys
  Camera2: Replace int[] by MeteringRectangle
parents 16a57276 b9a65de1

api/current.txt

+11 −16
Original line number Diff line number Diff line
@@ -12208,7 +12208,9 @@ package android.hardware.camera2 { 
    field public static final android.hardware.camera2.CameraCharacteristics.Key CONTROL_AVAILABLE_SCENE_MODES;

    field public static final android.hardware.camera2.CameraCharacteristics.Key CONTROL_AVAILABLE_VIDEO_STABILIZATION_MODES;

    field public static final android.hardware.camera2.CameraCharacteristics.Key CONTROL_AWB_AVAILABLE_MODES;

    field public static final android.hardware.camera2.CameraCharacteristics.Key CONTROL_MAX_REGIONS;

    field public static final android.hardware.camera2.CameraCharacteristics.Key CONTROL_MAX_REGIONS_AE;

    field public static final android.hardware.camera2.CameraCharacteristics.Key CONTROL_MAX_REGIONS_AF;

    field public static final android.hardware.camera2.CameraCharacteristics.Key CONTROL_MAX_REGIONS_AWB;

    field public static final android.hardware.camera2.CameraCharacteristics.Key EDGE_AVAILABLE_EDGE_MODES;

    field public static final android.hardware.camera2.CameraCharacteristics.Key FLASH_INFO_AVAILABLE;

    field public static final android.hardware.camera2.CameraCharacteristics.Key HOT_PIXEL_AVAILABLE_HOT_PIXEL_MODES;
@@ -12222,11 +12224,12 @@ package android.hardware.camera2 { 
    field public static final android.hardware.camera2.CameraCharacteristics.Key LENS_INFO_FOCUS_DISTANCE_CALIBRATION;

    field public static final android.hardware.camera2.CameraCharacteristics.Key LENS_INFO_HYPERFOCAL_DISTANCE;

    field public static final android.hardware.camera2.CameraCharacteristics.Key LENS_INFO_MINIMUM_FOCUS_DISTANCE;

    field public static final android.hardware.camera2.CameraCharacteristics.Key LENS_INFO_SHADING_MAP_SIZE;

    field public static final android.hardware.camera2.CameraCharacteristics.Key NOISE_REDUCTION_AVAILABLE_NOISE_REDUCTION_MODES;

    field public static final android.hardware.camera2.CameraCharacteristics.Key REQUEST_AVAILABLE_CAPABILITIES;

    field public static final android.hardware.camera2.CameraCharacteristics.Key REQUEST_MAX_NUM_INPUT_STREAMS;

    field public static final android.hardware.camera2.CameraCharacteristics.Key REQUEST_MAX_NUM_OUTPUT_STREAMS;

    field public static final android.hardware.camera2.CameraCharacteristics.Key REQUEST_MAX_NUM_OUTPUT_PROC;

    field public static final android.hardware.camera2.CameraCharacteristics.Key REQUEST_MAX_NUM_OUTPUT_PROC_STALLING;

    field public static final android.hardware.camera2.CameraCharacteristics.Key REQUEST_MAX_NUM_OUTPUT_RAW;

    field public static final android.hardware.camera2.CameraCharacteristics.Key REQUEST_PARTIAL_RESULT_COUNT;

    field public static final android.hardware.camera2.CameraCharacteristics.Key REQUEST_PIPELINE_MAX_DEPTH;

    field public static final android.hardware.camera2.CameraCharacteristics.Key SCALER_AVAILABLE_MAX_DIGITAL_ZOOM;
@@ -12539,9 +12542,7 @@ package android.hardware.camera2 { 
    field public static final android.hardware.camera2.CaptureRequest.Key EDGE_MODE;

    field public static final android.hardware.camera2.CaptureRequest.Key FLASH_MODE;

    field public static final android.hardware.camera2.CaptureRequest.Key HOT_PIXEL_MODE;

    field public static final android.hardware.camera2.CaptureRequest.Key JPEG_GPS_COORDINATES;

    field public static final android.hardware.camera2.CaptureRequest.Key JPEG_GPS_PROCESSING_METHOD;

    field public static final android.hardware.camera2.CaptureRequest.Key JPEG_GPS_TIMESTAMP;

    field public static final android.hardware.camera2.CaptureRequest.Key JPEG_GPS_LOCATION;

    field public static final android.hardware.camera2.CaptureRequest.Key JPEG_ORIENTATION;

    field public static final android.hardware.camera2.CaptureRequest.Key JPEG_QUALITY;

    field public static final android.hardware.camera2.CaptureRequest.Key JPEG_THUMBNAIL_QUALITY;
@@ -12562,9 +12563,7 @@ package android.hardware.camera2 { 
    field public static final android.hardware.camera2.CaptureRequest.Key STATISTICS_FACE_DETECT_MODE;

    field public static final android.hardware.camera2.CaptureRequest.Key STATISTICS_HOT_PIXEL_MAP_MODE;

    field public static final android.hardware.camera2.CaptureRequest.Key STATISTICS_LENS_SHADING_MAP_MODE;

    field public static final android.hardware.camera2.CaptureRequest.Key TONEMAP_CURVE_BLUE;

    field public static final android.hardware.camera2.CaptureRequest.Key TONEMAP_CURVE_GREEN;

    field public static final android.hardware.camera2.CaptureRequest.Key TONEMAP_CURVE_RED;

    field public static final android.hardware.camera2.CaptureRequest.Key TONEMAP_CURVE;

    field public static final android.hardware.camera2.CaptureRequest.Key TONEMAP_MODE;

  }








@@ -12617,9 +12616,7 @@ package android.hardware.camera2 {







    field public static final android.hardware.camera2.CaptureResult.Key FLASH_MODE;









    field public static final android.hardware.camera2.CaptureResult.Key FLASH_STATE;









    field public static final android.hardware.camera2.CaptureResult.Key HOT_PIXEL_MODE;









    field public static final android.hardware.camera2.CaptureResult.Key JPEG_GPS_COORDINATES;









    field public static final android.hardware.camera2.CaptureResult.Key JPEG_GPS_PROCESSING_METHOD;









    field public static final android.hardware.camera2.CaptureResult.Key JPEG_GPS_TIMESTAMP;









    field public static final android.hardware.camera2.CaptureResult.Key JPEG_GPS_LOCATION;









    field public static final android.hardware.camera2.CaptureResult.Key JPEG_ORIENTATION;









    field public static final android.hardware.camera2.CaptureResult.Key JPEG_QUALITY;









    field public static final android.hardware.camera2.CaptureResult.Key JPEG_THUMBNAIL_QUALITY;








@@ -12648,12 +12645,10 @@ package android.hardware.camera2 {







    field public static final android.hardware.camera2.CaptureResult.Key STATISTICS_FACE_DETECT_MODE;









    field public static final android.hardware.camera2.CaptureResult.Key STATISTICS_HOT_PIXEL_MAP;









    field public static final android.hardware.camera2.CaptureResult.Key STATISTICS_HOT_PIXEL_MAP_MODE;









    field public static final android.hardware.camera2.CaptureResult.Key STATISTICS_LENS_SHADING_MAP;









    field public static final android.hardware.camera2.CaptureResult.Key STATISTICS_LENS_SHADING_CORRECTION_MAP;









    field public static final android.hardware.camera2.CaptureResult.Key STATISTICS_LENS_SHADING_MAP_MODE;









    field public static final android.hardware.camera2.CaptureResult.Key STATISTICS_SCENE_FLICKER;









    field public static final android.hardware.camera2.CaptureResult.Key TONEMAP_CURVE_BLUE;









    field public static final android.hardware.camera2.CaptureResult.Key TONEMAP_CURVE_GREEN;









    field public static final android.hardware.camera2.CaptureResult.Key TONEMAP_CURVE_RED;









    field public static final android.hardware.camera2.CaptureResult.Key TONEMAP_CURVE;









    field public static final android.hardware.camera2.CaptureResult.Key TONEMAP_MODE;









  }