From 9cda0d98c19c46e52c104c470aa0a0c4ad4b6429 Mon Sep 17 00:00:00 2001
From: Sally Qi <sallyqi@google.com>
Date: Wed, 21 Dec 2022 12:32:29 -0800
Subject: [PATCH] Update javadoc for new added ColorSpace.

- The color space with non ICC transfer function is allowed.

Bug: 241284309
Test: builds
Change-Id: I64e4b887599ed60d79ed48e9d3c1f6748f12930f
---
 graphics/java/android/graphics/Bitmap.java       | 13 +++++++++----
 graphics/java/android/graphics/ImageDecoder.java |  9 +++++++--
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/graphics/java/android/graphics/Bitmap.java b/graphics/java/android/graphics/Bitmap.java
index 318cd32d19fed..3c654d6dec485 100644
--- a/graphics/java/android/graphics/Bitmap.java
+++ b/graphics/java/android/graphics/Bitmap.java
@@ -1810,10 +1810,15 @@ public final class Bitmap implements Parcelable {
      * {@code ColorSpace}.</p>
      *
      * @throws IllegalArgumentException If the specified color space is {@code null}, not
-     *         {@link ColorSpace.Model#RGB RGB}, has a transfer function that is not an
-     *         {@link ColorSpace.Rgb.TransferParameters ICC parametric curve}, or whose
-     *         components min/max values reduce the numerical range compared to the
-     *         previously assigned color space.
+     *         {@link ColorSpace.Model#RGB RGB}, or whose components min/max values reduce
+     *         the numerical range compared to the previously assigned color space.
+     *         Prior to {@link android.os.Build.VERSION_CODES#UPSIDE_DOWN_CAKE},
+     *         <code>IllegalArgumentException</code> will also be thrown
+     *         if the specified color space has a transfer function that is not an
+     *         {@link ColorSpace.Rgb.TransferParameters ICC parametric curve}. Starting from
+     *         {@link android.os.Build.VERSION_CODES#UPSIDE_DOWN_CAKE}, the color spaces with non
+     *         ICC parametric curve transfer function are allowed.
+     *         E.g., {@link ColorSpace.Named#BT2020_HLG BT2020_HLG}.
      *
      * @throws IllegalArgumentException If the {@code Config} (returned by {@link #getConfig()})
      *         is {@link Config#ALPHA_8}.
diff --git a/graphics/java/android/graphics/ImageDecoder.java b/graphics/java/android/graphics/ImageDecoder.java
index 239621eeed1e3..51f99ec637da7 100644
--- a/graphics/java/android/graphics/ImageDecoder.java
+++ b/graphics/java/android/graphics/ImageDecoder.java
@@ -1682,11 +1682,16 @@ public final class ImageDecoder implements AutoCloseable {
      * {@link #decodeBitmap decodeBitmap} when setting a non-RGB color space
      * such as {@link ColorSpace.Named#CIE_LAB Lab}.</p>
      *
-     * <p class="note">The specified color space's transfer function must be
+     * <p class="note">Prior to {@link android.os.Build.VERSION_CODES#UPSIDE_DOWN_CAKE},
+     * the specified color space's transfer function must be
      * an {@link ColorSpace.Rgb.TransferParameters ICC parametric curve}. An
      * <code>IllegalArgumentException</code> will be thrown by the decode methods
      * if calling {@link ColorSpace.Rgb#getTransferParameters()} on the
-     * specified color space returns null.</p>
+     * specified color space returns null.
+     * Starting from {@link android.os.Build.VERSION_CODES#UPSIDE_DOWN_CAKE},
+     * the color spaces with non ICC parametric curve transfer function are allowed.
+     * E.g., {@link ColorSpace.Named#BT2020_HLG BT2020_HLG}.
+     * </p>
      *
      * <p>Like all setters on ImageDecoder, this must be called inside
      * {@link OnHeaderDecodedListener#onHeaderDecoded onHeaderDecoded}.</p>