Undo aidl-freeze-api for diverged interfaces
These interfaces have changes internally and will neeed to have those
changes cherry-picked to aosp before they can be frozen and worked on in
aosp.
Test: m
Bug: 388072383
Change-Id: I7abe4076dfc52f015598c7033890b0a76bc938f3
Merged-In: Ibff72bad06fbc92e6f26854f7218a23b89bace19
diff --git a/graphics/common/aidl/Android.bp b/graphics/common/aidl/Android.bp
index 7bd776f..3c75d7b 100644
--- a/graphics/common/aidl/Android.bp
+++ b/graphics/common/aidl/Android.bp
@@ -43,7 +43,7 @@
enabled: true,
},
},
- frozen: true,
+ frozen: false,
versions_with_info: [
{
version: "1",
@@ -71,10 +71,6 @@
version: "5",
imports: ["android.hardware.common-V2"],
},
- {
- version: "6",
- imports: ["android.hardware.common-V2"],
- },
],
}
diff --git a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/.hash b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/.hash
deleted file mode 100644
index 57ea4c9..0000000
--- a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/.hash
+++ /dev/null
@@ -1 +0,0 @@
-8647425978f37b04679794cd83e492a11963c1ad
diff --git a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/AlphaInterpretation.aidl b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/AlphaInterpretation.aidl
deleted file mode 100644
index ea60283..0000000
--- a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/AlphaInterpretation.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * 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.common;
-/* @hide */
-@Backing(type="int") @VintfStability
-enum AlphaInterpretation {
- COVERAGE = 0,
- MASK = 1,
-}
diff --git a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/BlendMode.aidl b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/BlendMode.aidl
deleted file mode 100644
index d1f61be..0000000
--- a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/BlendMode.aidl
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Copyright (c) 2019, 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.common;
-/* @hide */
-@Backing(type="int") @VintfStability
-enum BlendMode {
- INVALID = 0,
- NONE = 1,
- PREMULTIPLIED = 2,
- COVERAGE = 3,
-}
diff --git a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/BufferUsage.aidl b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/BufferUsage.aidl
deleted file mode 100644
index 52b2a56..0000000
--- a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/BufferUsage.aidl
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2019 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.common;
-/* @hide */
-@Backing(type="long") @VintfStability
-enum BufferUsage {
- CPU_READ_MASK = 0xf,
- CPU_READ_NEVER = 0,
- CPU_READ_RARELY = 2,
- CPU_READ_OFTEN = 3,
- CPU_WRITE_MASK = (0xf << 4) /* 240 */,
- CPU_WRITE_NEVER = (0 << 4) /* 0 */,
- CPU_WRITE_RARELY = (2 << 4) /* 32 */,
- CPU_WRITE_OFTEN = (3 << 4) /* 48 */,
- GPU_TEXTURE = (1 << 8) /* 256 */,
- GPU_RENDER_TARGET = (1 << 9) /* 512 */,
- COMPOSER_OVERLAY = (1 << 11) /* 2048 */,
- COMPOSER_CLIENT_TARGET = (1 << 12) /* 4096 */,
- PROTECTED = (1 << 14) /* 16384 */,
- COMPOSER_CURSOR = (1 << 15) /* 32768 */,
- VIDEO_ENCODER = (1 << 16) /* 65536 */,
- CAMERA_OUTPUT = (1 << 17) /* 131072 */,
- CAMERA_INPUT = (1 << 18) /* 262144 */,
- RENDERSCRIPT = (1 << 20) /* 1048576 */,
- VIDEO_DECODER = (1 << 22) /* 4194304 */,
- SENSOR_DIRECT_DATA = (1 << 23) /* 8388608 */,
- GPU_DATA_BUFFER = (1 << 24) /* 16777216 */,
- GPU_CUBE_MAP = (1 << 25) /* 33554432 */,
- GPU_MIPMAP_COMPLETE = (1 << 26) /* 67108864 */,
- HW_IMAGE_ENCODER = (1 << 27) /* 134217728 */,
- FRONT_BUFFER = (1L << 32) /* 4294967296 */,
- VENDOR_MASK = (0xfL << 28) /* 4026531840 */,
- VENDOR_MASK_HI = ((1L * 0xffff) << 48) /* -281474976710656 */,
-}
diff --git a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/ChromaSiting.aidl b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/ChromaSiting.aidl
deleted file mode 100644
index 784fc17..0000000
--- a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/ChromaSiting.aidl
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Copyright (c) 2019, 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.common;
-/* @hide */
-@Backing(type="long") @VintfStability
-enum ChromaSiting {
- NONE = 0,
- UNKNOWN = 1,
- SITED_INTERSTITIAL = 2,
- COSITED_HORIZONTAL = 3,
- COSITED_VERTICAL = 4,
- COSITED_BOTH = 5,
-}
diff --git a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/ColorTransform.aidl b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/ColorTransform.aidl
deleted file mode 100644
index f74859b..0000000
--- a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/ColorTransform.aidl
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Copyright (c) 2021, 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.common;
-/* @hide */
-@Backing(type="int") @VintfStability
-enum ColorTransform {
- IDENTITY = 0,
- ARBITRARY_MATRIX = 1,
- VALUE_INVERSE = 2,
- GRAYSCALE = 3,
- CORRECT_PROTANOPIA = 4,
- CORRECT_DEUTERANOPIA = 5,
- CORRECT_TRITANOPIA = 6,
-}
diff --git a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/Compression.aidl b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/Compression.aidl
deleted file mode 100644
index 4f155e1..0000000
--- a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/Compression.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Copyright (c) 2019, 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.common;
-/* @hide */
-@Backing(type="long") @VintfStability
-enum Compression {
- NONE = 0,
- DISPLAY_STREAM_COMPRESSION = 1,
-}
diff --git a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/Cta861_3.aidl b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/Cta861_3.aidl
deleted file mode 100644
index ec90c9c..0000000
--- a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/Cta861_3.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Copyright (c) 2019, 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.common;
-/* @hide */
-@VintfStability
-parcelable Cta861_3 {
- float maxContentLightLevel;
- float maxFrameAverageLightLevel;
-}
diff --git a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/Dataspace.aidl b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/Dataspace.aidl
deleted file mode 100644
index 6ed5bb2..0000000
--- a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/Dataspace.aidl
+++ /dev/null
@@ -1,101 +0,0 @@
-/**
- * Copyright (c) 2019, 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.common;
-/* @hide */
-@Backing(type="int") @VintfStability
-enum Dataspace {
- UNKNOWN = 0x0,
- ARBITRARY = 0x1,
- STANDARD_SHIFT = 16,
- STANDARD_MASK = (63 << 16) /* 4128768 */,
- STANDARD_UNSPECIFIED = (0 << 16) /* 0 */,
- STANDARD_BT709 = (1 << 16) /* 65536 */,
- STANDARD_BT601_625 = (2 << 16) /* 131072 */,
- STANDARD_BT601_625_UNADJUSTED = (3 << 16) /* 196608 */,
- STANDARD_BT601_525 = (4 << 16) /* 262144 */,
- STANDARD_BT601_525_UNADJUSTED = (5 << 16) /* 327680 */,
- STANDARD_BT2020 = (6 << 16) /* 393216 */,
- STANDARD_BT2020_CONSTANT_LUMINANCE = (7 << 16) /* 458752 */,
- STANDARD_BT470M = (8 << 16) /* 524288 */,
- STANDARD_FILM = (9 << 16) /* 589824 */,
- STANDARD_DCI_P3 = (10 << 16) /* 655360 */,
- STANDARD_ADOBE_RGB = (11 << 16) /* 720896 */,
- TRANSFER_SHIFT = 22,
- TRANSFER_MASK = (31 << 22) /* 130023424 */,
- TRANSFER_UNSPECIFIED = (0 << 22) /* 0 */,
- TRANSFER_LINEAR = (1 << 22) /* 4194304 */,
- TRANSFER_SRGB = (2 << 22) /* 8388608 */,
- TRANSFER_SMPTE_170M = (3 << 22) /* 12582912 */,
- TRANSFER_GAMMA2_2 = (4 << 22) /* 16777216 */,
- TRANSFER_GAMMA2_6 = (5 << 22) /* 20971520 */,
- TRANSFER_GAMMA2_8 = (6 << 22) /* 25165824 */,
- TRANSFER_ST2084 = (7 << 22) /* 29360128 */,
- TRANSFER_HLG = (8 << 22) /* 33554432 */,
- RANGE_SHIFT = 27,
- RANGE_MASK = (7 << 27) /* 939524096 */,
- RANGE_UNSPECIFIED = (0 << 27) /* 0 */,
- RANGE_FULL = (1 << 27) /* 134217728 */,
- RANGE_LIMITED = (2 << 27) /* 268435456 */,
- RANGE_EXTENDED = (3 << 27) /* 402653184 */,
- SRGB_LINEAR = (((1 << 16) | (1 << 22)) | (1 << 27)) /* 138477568 */,
- SCRGB_LINEAR = (((1 << 16) | (1 << 22)) | (3 << 27)) /* 406913024 */,
- SRGB = (((1 << 16) | (2 << 22)) | (1 << 27)) /* 142671872 */,
- SCRGB = (((1 << 16) | (2 << 22)) | (3 << 27)) /* 411107328 */,
- JFIF = (((2 << 16) | (3 << 22)) | (1 << 27)) /* 146931712 */,
- BT601_625 = (((2 << 16) | (3 << 22)) | (2 << 27)) /* 281149440 */,
- BT601_525 = (((4 << 16) | (3 << 22)) | (2 << 27)) /* 281280512 */,
- BT709 = (((1 << 16) | (3 << 22)) | (2 << 27)) /* 281083904 */,
- DCI_P3_LINEAR = (((10 << 16) | (1 << 22)) | (1 << 27)) /* 139067392 */,
- DCI_P3 = (((10 << 16) | (5 << 22)) | (1 << 27)) /* 155844608 */,
- DISPLAY_P3_LINEAR = (((10 << 16) | (1 << 22)) | (1 << 27)) /* 139067392 */,
- DISPLAY_P3 = (((10 << 16) | (2 << 22)) | (1 << 27)) /* 143261696 */,
- ADOBE_RGB = (((11 << 16) | (4 << 22)) | (1 << 27)) /* 151715840 */,
- ADOBE_RGB_LINEAR = (((11 << 16) | (1 << 22)) | (1 << 27)) /* 139132928 */,
- BT2020_LINEAR = (((6 << 16) | (1 << 22)) | (1 << 27)) /* 138805248 */,
- BT2020 = (((6 << 16) | (3 << 22)) | (1 << 27)) /* 147193856 */,
- BT2020_PQ = (((6 << 16) | (7 << 22)) | (1 << 27)) /* 163971072 */,
- BT2020_LINEAR_EXTENDED = (((6 << 16) | (1 << 22)) | (3 << 27)) /* 407240704 */,
- DEPTH = 0x1000,
- SENSOR = 0x1001,
- BT2020_ITU = (((6 << 16) | (3 << 22)) | (2 << 27)) /* 281411584 */,
- BT2020_ITU_PQ = (((6 << 16) | (7 << 22)) | (2 << 27)) /* 298188800 */,
- BT2020_ITU_HLG = (((6 << 16) | (8 << 22)) | (2 << 27)) /* 302383104 */,
- BT2020_HLG = (((6 << 16) | (8 << 22)) | (1 << 27)) /* 168165376 */,
- DISPLAY_BT2020 = (((6 << 16) | (2 << 22)) | (1 << 27)) /* 142999552 */,
- DYNAMIC_DEPTH = 0x1002,
- JPEG_APP_SEGMENTS = 0x1003,
- HEIF = 0x1004,
- JPEG_R = 0x1005,
- BT709_FULL_RANGE = (((1 << 16) | (3 << 22)) | (1 << 27)) /* 146866176 */,
-}
diff --git a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/DisplayDecorationSupport.aidl b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/DisplayDecorationSupport.aidl
deleted file mode 100644
index 27eff76..0000000
--- a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/DisplayDecorationSupport.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * 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.common;
-/* @hide */
-@VintfStability
-parcelable DisplayDecorationSupport {
- android.hardware.graphics.common.PixelFormat format;
- android.hardware.graphics.common.AlphaInterpretation alphaInterpretation;
-}
diff --git a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/DisplayHotplugEvent.aidl b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/DisplayHotplugEvent.aidl
deleted file mode 100644
index 63dca0a..0000000
--- a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/DisplayHotplugEvent.aidl
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Copyright (c) 2023, 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.common;
-@Backing(type="int") @VintfStability
-enum DisplayHotplugEvent {
- CONNECTED = 0,
- DISCONNECTED = 1,
- ERROR_UNKNOWN = (-1) /* -1 */,
- ERROR_INCOMPATIBLE_CABLE = (-2) /* -2 */,
- ERROR_TOO_MANY_DISPLAYS = (-3) /* -3 */,
-}
diff --git a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/ExtendableType.aidl b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/ExtendableType.aidl
deleted file mode 100644
index 5ff1775..0000000
--- a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/ExtendableType.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Copyright (c) 2019, 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.common;
-/* @hide */
-@VintfStability
-parcelable ExtendableType {
- @utf8InCpp String name;
- long value = 0;
-}
diff --git a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/FRect.aidl b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/FRect.aidl
deleted file mode 100644
index 7972e11..0000000
--- a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/FRect.aidl
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Copyright (c) 2021, 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.common;
-/* @hide */
-@VintfStability
-parcelable FRect {
- float left;
- float top;
- float right;
- float bottom;
-}
diff --git a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/HardwareBuffer.aidl b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/HardwareBuffer.aidl
deleted file mode 100644
index 0fe9493..0000000
--- a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/HardwareBuffer.aidl
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2019 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.common;
-/**
- * @hide
- * @deprecated : Use instead android.hardware.HardwareBuffer in frameworks/base
- */
-@VintfStability
-parcelable HardwareBuffer {
- android.hardware.graphics.common.HardwareBufferDescription description;
- android.hardware.common.NativeHandle handle;
-}
diff --git a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/HardwareBufferDescription.aidl b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/HardwareBufferDescription.aidl
deleted file mode 100644
index 70f46a1..0000000
--- a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/HardwareBufferDescription.aidl
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2019 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.common;
-/* @hide */
-@VintfStability
-parcelable HardwareBufferDescription {
- int width;
- int height;
- int layers;
- android.hardware.graphics.common.PixelFormat format = android.hardware.graphics.common.PixelFormat.UNSPECIFIED;
- android.hardware.graphics.common.BufferUsage usage = android.hardware.graphics.common.BufferUsage.CPU_READ_NEVER;
- int stride;
-}
diff --git a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/Hdr.aidl b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/Hdr.aidl
deleted file mode 100644
index 71927b6..0000000
--- a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/Hdr.aidl
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Copyright (c) 2021, 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.common;
-/* @hide */
-@Backing(type="int") @VintfStability
-enum Hdr {
- INVALID = 0,
- DOLBY_VISION = 1,
- HDR10 = 2,
- HLG = 3,
- HDR10_PLUS = 4,
- DOLBY_VISION_4K30 = 5,
-}
diff --git a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/HdrConversionCapability.aidl b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/HdrConversionCapability.aidl
deleted file mode 100644
index b74f7d7..0000000
--- a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/HdrConversionCapability.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * 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.common;
-@VintfStability
-parcelable HdrConversionCapability {
- android.hardware.graphics.common.Hdr sourceType;
- android.hardware.graphics.common.Hdr outputType;
- boolean addsLatency;
-}
diff --git a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/HdrConversionStrategy.aidl b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/HdrConversionStrategy.aidl
deleted file mode 100644
index db785cf..0000000
--- a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/HdrConversionStrategy.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * 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.common;
-@VintfStability
-union HdrConversionStrategy {
- boolean passthrough = true;
- android.hardware.graphics.common.Hdr[] autoAllowedHdrTypes;
- android.hardware.graphics.common.Hdr forceHdrConversion;
-}
diff --git a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/Interlaced.aidl b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/Interlaced.aidl
deleted file mode 100644
index e04d2ab..0000000
--- a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/Interlaced.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Copyright (c) 2019, 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.common;
-/* @hide */
-@Backing(type="long") @VintfStability
-enum Interlaced {
- NONE = 0,
- TOP_BOTTOM = 1,
- RIGHT_LEFT = 2,
-}
diff --git a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/PixelFormat.aidl b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/PixelFormat.aidl
deleted file mode 100644
index 54a9d8d..0000000
--- a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/PixelFormat.aidl
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2019 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.common;
-/* @hide */
-@Backing(type="int") @VintfStability
-enum PixelFormat {
- UNSPECIFIED = 0,
- RGBA_8888 = 0x1,
- RGBX_8888 = 0x2,
- RGB_888 = 0x3,
- RGB_565 = 0x4,
- BGRA_8888 = 0x5,
- YCBCR_422_SP = 0x10,
- YCRCB_420_SP = 0x11,
- YCBCR_422_I = 0x14,
- RGBA_FP16 = 0x16,
- RAW16 = 0x20,
- BLOB = 0x21,
- IMPLEMENTATION_DEFINED = 0x22,
- YCBCR_420_888 = 0x23,
- RAW_OPAQUE = 0x24,
- RAW10 = 0x25,
- RAW12 = 0x26,
- RGBA_1010102 = 0x2B,
- Y8 = 0x20203859,
- Y16 = 0x20363159,
- YV12 = 0x32315659,
- DEPTH_16 = 0x30,
- DEPTH_24 = 0x31,
- DEPTH_24_STENCIL_8 = 0x32,
- DEPTH_32F = 0x33,
- DEPTH_32F_STENCIL_8 = 0x34,
- STENCIL_8 = 0x35,
- YCBCR_P010 = 0x36,
- HSV_888 = 0x37,
- R_8 = 0x38,
- R_16_UINT = 0x39,
- RG_1616_UINT = 0x3a,
- RGBA_10101010 = 0x3b,
- YCBCR_P210 = 0x3c,
-}
diff --git a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/PlaneLayout.aidl b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/PlaneLayout.aidl
deleted file mode 100644
index a090975..0000000
--- a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/PlaneLayout.aidl
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * Copyright (c) 2019, 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.common;
-/* @hide */
-@VintfStability
-parcelable PlaneLayout {
- android.hardware.graphics.common.PlaneLayoutComponent[] components;
- long offsetInBytes;
- long sampleIncrementInBits;
- long strideInBytes;
- long widthInSamples;
- long heightInSamples;
- long totalSizeInBytes;
- long horizontalSubsampling;
- long verticalSubsampling;
-}
diff --git a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/PlaneLayoutComponent.aidl b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/PlaneLayoutComponent.aidl
deleted file mode 100644
index 0768240..0000000
--- a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/PlaneLayoutComponent.aidl
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Copyright (c) 2019, 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.common;
-/* @hide */
-@VintfStability
-parcelable PlaneLayoutComponent {
- android.hardware.graphics.common.ExtendableType type;
- long offsetInBits;
- long sizeInBits;
-}
diff --git a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/PlaneLayoutComponentType.aidl b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/PlaneLayoutComponentType.aidl
deleted file mode 100644
index e306751..0000000
--- a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/PlaneLayoutComponentType.aidl
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * Copyright (c) 2019, 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.common;
-/* @hide */
-@Backing(type="long") @VintfStability
-enum PlaneLayoutComponentType {
- Y = (1 << 0) /* 1 */,
- CB = (1 << 1) /* 2 */,
- CR = (1 << 2) /* 4 */,
- R = (1 << 10) /* 1024 */,
- G = (1 << 11) /* 2048 */,
- B = (1 << 12) /* 4096 */,
- RAW = (1 << 20) /* 1048576 */,
- A = (1 << 30) /* 1073741824 */,
-}
diff --git a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/Point.aidl b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/Point.aidl
deleted file mode 100644
index af4705a..0000000
--- a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/Point.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Copyright (c) 2021, 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.common;
-/* @hide */
-@VintfStability
-parcelable Point {
- int x;
- int y;
-}
diff --git a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/Rect.aidl b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/Rect.aidl
deleted file mode 100644
index 463a68f..0000000
--- a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/Rect.aidl
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Copyright (c) 2019, 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.common;
-/* @hide */
-@VintfStability
-parcelable Rect {
- int left;
- int top;
- int right;
- int bottom;
-}
diff --git a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/Smpte2086.aidl b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/Smpte2086.aidl
deleted file mode 100644
index dce9226..0000000
--- a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/Smpte2086.aidl
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Copyright (c) 2019, 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.common;
-/* @hide */
-@VintfStability
-parcelable Smpte2086 {
- android.hardware.graphics.common.XyColor primaryRed;
- android.hardware.graphics.common.XyColor primaryGreen;
- android.hardware.graphics.common.XyColor primaryBlue;
- android.hardware.graphics.common.XyColor whitePoint;
- float maxLuminance;
- float minLuminance;
-}
diff --git a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/StandardMetadataType.aidl b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/StandardMetadataType.aidl
deleted file mode 100644
index 6e2e106..0000000
--- a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/StandardMetadataType.aidl
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * Copyright (c) 2019,libgralloctypes_helper 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.common;
-/* @hide */
-@Backing(type="long") @VintfStability
-enum StandardMetadataType {
- INVALID = 0,
- BUFFER_ID = 1,
- NAME = 2,
- WIDTH = 3,
- HEIGHT = 4,
- LAYER_COUNT = 5,
- PIXEL_FORMAT_REQUESTED = 6,
- PIXEL_FORMAT_FOURCC = 7,
- PIXEL_FORMAT_MODIFIER = 8,
- USAGE = 9,
- ALLOCATION_SIZE = 10,
- PROTECTED_CONTENT = 11,
- COMPRESSION = 12,
- INTERLACED = 13,
- CHROMA_SITING = 14,
- PLANE_LAYOUTS = 15,
- CROP = 16,
- DATASPACE = 17,
- BLEND_MODE = 18,
- SMPTE2086 = 19,
- CTA861_3 = 20,
- SMPTE2094_40 = 21,
- SMPTE2094_10 = 22,
- STRIDE = 23,
-}
diff --git a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/Transform.aidl b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/Transform.aidl
deleted file mode 100644
index dbed57d..0000000
--- a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/Transform.aidl
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Copyright (c) 2021, 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.common;
-/* @hide */
-@Backing(type="int") @VintfStability
-enum Transform {
- NONE = 0,
- FLIP_H = (1 << 0) /* 1 */,
- FLIP_V = (1 << 1) /* 2 */,
- ROT_90 = (1 << 2) /* 4 */,
- ROT_180 = (FLIP_H | FLIP_V) /* 3 */,
- ROT_270 = ((FLIP_H | FLIP_V) | ROT_90) /* 7 */,
-}
diff --git a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/XyColor.aidl b/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/XyColor.aidl
deleted file mode 100644
index e300f25..0000000
--- a/graphics/common/aidl/aidl_api/android.hardware.graphics.common/6/android/hardware/graphics/common/XyColor.aidl
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Copyright (c) 2019, 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.common;
-/* @hide */
-@VintfStability
-parcelable XyColor {
- float x;
- float y;
-}