From 88e871b66353803062f1d0ed5d06b176800a35f3 Mon Sep 17 00:00:00 2001
From: Alec Mouri <alecmouri@google.com>
Date: Thu, 24 Feb 2022 12:15:09 -0800
Subject: [PATCH] Actually add DimmingStage to client target properties

This change was missed while cherry-picking
I5675c16f0895f9958e3bee3ee4c85df8937ecdb7 due to merge conflicts.
So...actually merge this.

Bug: 218954037
Test: builds
Change-Id: Idb3a518f7dfd4f4fd598672ee709ccd5b1f3f06a
---
 .../ClientTargetPropertyWithBrightness.aidl       |  1 +
 .../ClientTargetPropertyWithBrightness.aidl       | 15 +++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/graphics/composer/aidl/aidl_api/android.hardware.graphics.composer3/current/android/hardware/graphics/composer3/ClientTargetPropertyWithBrightness.aidl b/graphics/composer/aidl/aidl_api/android.hardware.graphics.composer3/current/android/hardware/graphics/composer3/ClientTargetPropertyWithBrightness.aidl
index c445f30bcd..8fb6933c95 100644
--- a/graphics/composer/aidl/aidl_api/android.hardware.graphics.composer3/current/android/hardware/graphics/composer3/ClientTargetPropertyWithBrightness.aidl
+++ b/graphics/composer/aidl/aidl_api/android.hardware.graphics.composer3/current/android/hardware/graphics/composer3/ClientTargetPropertyWithBrightness.aidl
@@ -37,4 +37,5 @@ parcelable ClientTargetPropertyWithBrightness {
   long display;
   android.hardware.graphics.composer3.ClientTargetProperty clientTargetProperty;
   float brightness;
+  android.hardware.graphics.composer3.DimmingStage dimmingStage;
 }
diff --git a/graphics/composer/aidl/android/hardware/graphics/composer3/ClientTargetPropertyWithBrightness.aidl b/graphics/composer/aidl/android/hardware/graphics/composer3/ClientTargetPropertyWithBrightness.aidl
index d9e4e16788..ba6fe97c3d 100644
--- a/graphics/composer/aidl/android/hardware/graphics/composer3/ClientTargetPropertyWithBrightness.aidl
+++ b/graphics/composer/aidl/android/hardware/graphics/composer3/ClientTargetPropertyWithBrightness.aidl
@@ -17,6 +17,7 @@
 package android.hardware.graphics.composer3;
 
 import android.hardware.graphics.composer3.ClientTargetProperty;
+import android.hardware.graphics.composer3.DimmingStage;
 
 @VintfStability
 parcelable ClientTargetPropertyWithBrightness {
@@ -35,4 +36,18 @@ parcelable ClientTargetPropertyWithBrightness {
      * The brightness as described in CommandResultPayload.clientTargetProperty
      */
     float brightness;
+
+    /**
+     * The stage in which dimming operations should be performed when compositing
+     * the client target.
+     * Note that with a COLORIMETRIC RenderIntent, DimmingSpace must be LINEAR. That is, dimming
+     * is defined to occur in linear space.
+     * However, some composer implementations may, with other vendor-defined RenderIntents,
+     * configure their hardware such as image quality adjustments is intended to occur after
+     * composition. In this scenario, if the dimming operation were applied in linear space,
+     * then the resulting dimming operation may comepl those image quality adjustments to
+     * incorrectly alter the gamma curve. To avoid this issue, those implementations must opt to
+     * dim in gamma space.
+     */
+    DimmingStage dimmingStage;
 }