Merge "Revert "android.hardware.media.c2: Move to staging/"" into udc-dev-plus-aosp (a38827ed) · Commits · e / os / android_hardware_interfaces

compatibility_matrices/compatibility_matrix.9.xml

+9 −0

Original line number	Diff line number	Diff line
		@@ -356,6 +356,15 @@
		<regex-instance>vendor[0-9]*_software</regex-instance>
		</interface>
		</hal>
		<hal format="aidl" optional="true">
		<name>android.hardware.media.c2</name>
		<version>1</version>
		<interface>
		<name>IComponentStore</name>
		<regex-instance>default[0-9]*</regex-instance>
		<regex-instance>vendor[0-9]*_software</regex-instance>
		</interface>
		</hal>
		<hal format="aidl" optional="true">
		<name>android.hardware.memtrack</name>
		<version>1</version>

compatibility_matrices/exclude/fcm_exclude.cpp

+0 −4

Original line number	Diff line number	Diff line
		@@ -103,10 +103,6 @@ bool ShouldCheckMissingHalsInFcm(const std::string& package) {
		"android.hardware.thermal@1.0",
		"android.hardware.thermal@1.1",
		"android.hardware.wifi.offload@1.0",

		// Under hardware/interfaces/staging, still in development
		// AIDL
		"android.hardware.media.c2",
		};

		auto package_has_prefix = [&](const std::string& prefix) {

staging/c2/aidl/Android.bp→media/c2/aidl/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -13,7 +13,6 @@ aidl_interface {
		name: "android.hardware.media.c2",
		vendor_available: true,
		double_loadable: true,
		unstable: true,
		srcs: ["android/hardware/media/c2/*.aidl"],
		include_dirs: [
		"frameworks/native/aidl/gui",
		@@ -22,6 +21,7 @@ aidl_interface {
		"android.hardware.common-V2",
		"android.hardware.media.bufferpool2-V1",
		],
		stability: "vintf",
		backend: {
		cpp: {
		enabled: false,

media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/BaseBlock.aidl

0 → 100644

+39 −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.media.c2;
		@VintfStability
		union BaseBlock {
		android.hardware.common.NativeHandle nativeBlock;
		android.hardware.media.bufferpool2.BufferStatusMessage pooledBlock;
		}

media/c2/aidl/aidl_api/android.hardware.media.c2/current/android/hardware/media/c2/Block.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.media.c2;
		@VintfStability
		parcelable Block {
		int index;
		android.hardware.media.c2.Params meta;
		android.hardware.common.NativeHandle fence;
		}