Merge "Add composer API changes in accordance to partner feedback" into tm-dev am: 6f62c70f4f (b4c953bc) · Commits · e / os / android_hardware_interfaces

graphics/composer/aidl/aidl_api/android.hardware.graphics.composer3/current/android/hardware/graphics/composer3/DimmingStage.aidl

0 → 100644

+40 −0

Original line number	Diff line number	Diff line
		/**
		* Copyright (c) 2022, The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		///////////////////////////////////////////////////////////////////////////////
		// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. //
		///////////////////////////////////////////////////////////////////////////////

		// This file is a snapshot of an AIDL file. Do not edit it manually. There are
		// two cases:
		// 1). this is a frozen version file - do not edit this in any case.
		// 2). this is a 'current' file. If you make a backwards compatible change to
		// the interface (from the latest frozen version), the build system will
		// prompt you to update this file with `m <name>-update-api`.
		//
		// You must not make a backward incompatible change to any AIDL file built
		// with the aidl_interface module type with versions property set. The module
		// type is used to build AIDL files in a way that they can be used across
		// independently updatable components of the system. If a device is shipped
		// with such a backward incompatible change, it has a high risk of breaking
		// later when a module using the interface is updated, e.g., Mainline modules.

		package android.hardware.graphics.composer3;
		@Backing(type="int") @VintfStability
		enum DimmingStage {
		NONE = 0,
		LINEAR = 1,
		GAMMA_OETF = 2,
		}

graphics/composer/aidl/aidl_api/android.hardware.graphics.composer3/current/android/hardware/graphics/composer3/DisplayBrightness.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -35,4 +35,5 @@ package android.hardware.graphics.composer3;
		@VintfStability
		parcelable DisplayBrightness {
		float brightness;
		float brightnessNits;
		}

graphics/composer/aidl/android/hardware/graphics/composer3/DimmingStage.aidl

0 → 100644

+35 −0

Original line number	Diff line number	Diff line
		/**
		* Copyright (c) 2022, The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.hardware.graphics.composer3;

		@VintfStability
		@Backing(type="int")
		enum DimmingStage {
		/**
		* Corresponds to if the dimming stage is not meaningful for a scene, such as
		* if client composition is not requesting dimming.
		*/
		NONE = 0,
		/**
		* Dimming operations must be applied in linear optical space
		*/
		LINEAR = 1,
		/**
		* Dimming operations must be applied in gamma space, after OETF has been applied
		*/
		GAMMA_OETF = 2,
		}

graphics/composer/aidl/android/hardware/graphics/composer3/DisplayBrightness.aidl

+10 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,16 @@ package android.hardware.graphics.composer3;
		parcelable DisplayBrightness {
		/**
		* A number between 0.0f (minimum brightness) and 1.0f (maximum brightness), a negative value to
		* turn the backlight off.
		* turn the backlight off
		*/
		float brightness;

		/**
		* The absolute brightness in nits of the backlight, if it is available. This will be a negative
		* value if it is not known.
		*
		* An implementation may choose to use this value to assist with tone-mapping, as a mapping
		* between the brightness float and the nits may not otherwise be known.
		*/
		float brightnessNits;
		}