Merge "Actually add DimmingStage to client target properties" into tm-dev
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 c445f30..8fb6933 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 @@
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 d9e4e16..ba6fe97 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 @@
* 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;
}