From 67e5d747b58511424a9c3b4f4d81b00252623161 Mon Sep 17 00:00:00 2001 From: Austin Borger Date: Thu, 16 Mar 2023 10:32:56 -0700 Subject: [PATCH] CameraCharacteristics: Remove unsupported color space enums. Bug: 273961103 Test: Presubmit Change-Id: I750c1e2ab6c2b00c3635cf1b4bfe64bb48744a34 --- .../camera2/CameraCharacteristics.java | 30 ++----------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/core/java/android/hardware/camera2/CameraCharacteristics.java b/core/java/android/hardware/camera2/CameraCharacteristics.java index b9b310fcc542a..115fc944d9f9c 100644 --- a/core/java/android/hardware/camera2/CameraCharacteristics.java +++ b/core/java/android/hardware/camera2/CameraCharacteristics.java @@ -2550,41 +2550,15 @@ public final class CameraCharacteristics extends CameraMetadata *
  • {@link #REQUEST_AVAILABLE_COLOR_SPACE_PROFILES_MAP_UNSPECIFIED UNSPECIFIED}
    • *
  • {@link #REQUEST_AVAILABLE_COLOR_SPACE_PROFILES_MAP_SRGB SRGB}
    • - *
  • {@link #REQUEST_AVAILABLE_COLOR_SPACE_PROFILES_MAP_LINEAR_SRGB LINEAR_SRGB}
    • - *
  • {@link #REQUEST_AVAILABLE_COLOR_SPACE_PROFILES_MAP_EXTENDED_SRGB EXTENDED_SRGB}
    • - *
  • {@link #REQUEST_AVAILABLE_COLOR_SPACE_PROFILES_MAP_LINEAR_EXTENDED_SRGB LINEAR_EXTENDED_SRGB}
    • - *
  • {@link #REQUEST_AVAILABLE_COLOR_SPACE_PROFILES_MAP_BT709 BT709}
    • - *
  • {@link #REQUEST_AVAILABLE_COLOR_SPACE_PROFILES_MAP_BT2020 BT2020}
    • - *
  • {@link #REQUEST_AVAILABLE_COLOR_SPACE_PROFILES_MAP_DCI_P3 DCI_P3}
    • *
  • {@link #REQUEST_AVAILABLE_COLOR_SPACE_PROFILES_MAP_DISPLAY_P3 DISPLAY_P3}
    • - *
  • {@link #REQUEST_AVAILABLE_COLOR_SPACE_PROFILES_MAP_NTSC_1953 NTSC_1953}
    • - *
  • {@link #REQUEST_AVAILABLE_COLOR_SPACE_PROFILES_MAP_SMPTE_C SMPTE_C}
    • - *
  • {@link #REQUEST_AVAILABLE_COLOR_SPACE_PROFILES_MAP_ADOBE_RGB ADOBE_RGB}
    • - *
  • {@link #REQUEST_AVAILABLE_COLOR_SPACE_PROFILES_MAP_PRO_PHOTO_RGB PRO_PHOTO_RGB}
    • - *
  • {@link #REQUEST_AVAILABLE_COLOR_SPACE_PROFILES_MAP_ACES ACES}
    • - *
  • {@link #REQUEST_AVAILABLE_COLOR_SPACE_PROFILES_MAP_ACESCG ACESCG}
    • - *
  • {@link #REQUEST_AVAILABLE_COLOR_SPACE_PROFILES_MAP_CIE_XYZ CIE_XYZ}
    • - *
  • {@link #REQUEST_AVAILABLE_COLOR_SPACE_PROFILES_MAP_CIE_LAB CIE_LAB}
    • + *
  • {@link #REQUEST_AVAILABLE_COLOR_SPACE_PROFILES_MAP_BT2020_HLG BT2020_HLG}
    • * * *

    Optional - The value for this key may be {@code null} on some devices.

    * @see #REQUEST_AVAILABLE_COLOR_SPACE_PROFILES_MAP_UNSPECIFIED * @see #REQUEST_AVAILABLE_COLOR_SPACE_PROFILES_MAP_SRGB - * @see #REQUEST_AVAILABLE_COLOR_SPACE_PROFILES_MAP_LINEAR_SRGB - * @see #REQUEST_AVAILABLE_COLOR_SPACE_PROFILES_MAP_EXTENDED_SRGB - * @see #REQUEST_AVAILABLE_COLOR_SPACE_PROFILES_MAP_LINEAR_EXTENDED_SRGB - * @see #REQUEST_AVAILABLE_COLOR_SPACE_PROFILES_MAP_BT709 - * @see #REQUEST_AVAILABLE_COLOR_SPACE_PROFILES_MAP_BT2020 - * @see #REQUEST_AVAILABLE_COLOR_SPACE_PROFILES_MAP_DCI_P3 * @see #REQUEST_AVAILABLE_COLOR_SPACE_PROFILES_MAP_DISPLAY_P3 - * @see #REQUEST_AVAILABLE_COLOR_SPACE_PROFILES_MAP_NTSC_1953 - * @see #REQUEST_AVAILABLE_COLOR_SPACE_PROFILES_MAP_SMPTE_C - * @see #REQUEST_AVAILABLE_COLOR_SPACE_PROFILES_MAP_ADOBE_RGB - * @see #REQUEST_AVAILABLE_COLOR_SPACE_PROFILES_MAP_PRO_PHOTO_RGB - * @see #REQUEST_AVAILABLE_COLOR_SPACE_PROFILES_MAP_ACES - * @see #REQUEST_AVAILABLE_COLOR_SPACE_PROFILES_MAP_ACESCG - * @see #REQUEST_AVAILABLE_COLOR_SPACE_PROFILES_MAP_CIE_XYZ - * @see #REQUEST_AVAILABLE_COLOR_SPACE_PROFILES_MAP_CIE_LAB + * @see #REQUEST_AVAILABLE_COLOR_SPACE_PROFILES_MAP_BT2020_HLG * @hide */ public static final Key REQUEST_AVAILABLE_COLOR_SPACE_PROFILES_MAP =