From 6541a053258a15dca0b15b0a91effc6086e70499 Mon Sep 17 00:00:00 2001
From: Sally Qi <sallyqi@google.com>
Date: Wed, 1 Jun 2022 16:31:33 -0700
Subject: [PATCH] Add DATASPACE_BT2020_HLG into DataSpace API.

Bug: 231727035
Test: builds
Change-Id: Ie2f5f61f2bda3bfb5bf02a2bb91d5e14d931aabf
---
 core/api/current.txt                      |  1 +
 core/java/android/hardware/DataSpace.java | 13 +++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/core/api/current.txt b/core/api/current.txt
index 31b0f057d4ea5..be849c78f8458 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -16839,6 +16839,7 @@ package android.hardware {
     method public static int pack(int, int, int);
     field public static final int DATASPACE_ADOBE_RGB = 151715840; // 0x90b0000
     field public static final int DATASPACE_BT2020 = 147193856; // 0x8c60000
+    field public static final int DATASPACE_BT2020_HLG = 168165376; // 0xa060000
     field public static final int DATASPACE_BT2020_PQ = 163971072; // 0x9c60000
     field public static final int DATASPACE_BT601_525 = 281280512; // 0x10c40000
     field public static final int DATASPACE_BT601_625 = 281149440; // 0x10c20000
diff --git a/core/java/android/hardware/DataSpace.java b/core/java/android/hardware/DataSpace.java
index 4411918db1ad5..9734ab63457c6 100644
--- a/core/java/android/hardware/DataSpace.java
+++ b/core/java/android/hardware/DataSpace.java
@@ -393,6 +393,7 @@ public final class DataSpace {
         DATASPACE_SRGB,
         DATASPACE_SCRGB,
         DATASPACE_DISPLAY_P3,
+        DATASPACE_BT2020_HLG,
         DATASPACE_BT2020_PQ,
         DATASPACE_ADOBE_RGB,
         DATASPACE_JFIF,
@@ -471,6 +472,18 @@ public final class DataSpace {
      *   Range: RANGE_FULL</pre>
      */
     public static final int DATASPACE_DISPLAY_P3 = 143261696;
+
+    /**
+     * Hybrid Log Gamma encoding.
+     *
+     * <p>Composed of the following -</p>
+     * <pre>
+     *   Primaries: STANDARD_BT2020
+     *   Transfer: TRANSFER_HLG
+     *   Range: RANGE_FULL</pre>
+     */
+    public static final int DATASPACE_BT2020_HLG = 168165376;
+
     /**
      * ITU-R Recommendation 2020 (BT.2020)
      *