Merge "Memtrack HAL: Remove MemtrackType::NUM_TYPES" (5a52686f) · Commits · e / os / android_hardware_interfaces

memtrack/aidl/aidl_api/android.hardware.memtrack/current/android/hardware/memtrack/DeviceInfo.aidl

+22 −7

Original line number	Original line	Diff line number	Diff line
	///////////////////////////////////////////////////////////////////////////////		/*
			* Copyright (C) 2020 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 IMMUTABLE. DO NOT EDIT IN ANY CASE. //
	///////////////////////////////////////////////////////////////////////////////		///////////////////////////////////////////////////////////////////////////////

	// This file is a snapshot of an AIDL interface (or parcelable). Do not try to		// This file is a snapshot of an AIDL file. Do not edit it manually. There are
	// edit this file. It looks like you are doing that because you have modified		// two cases:
	// an AIDL interface in a backward-incompatible way, e.g., deleting a function		// 1). this is a frozen version file - do not edit this in any case.
	// from an interface or a field from a parcelable and it broke the build. That		// 2). this is a 'current' file. If you make a backwards compatible change to
	// breakage is intended.		// 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 changes to the AIDL files built		// 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		// 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		// 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		// independently updatable components of the system. If a device is shipped

memtrack/aidl/aidl_api/android.hardware.memtrack/current/android/hardware/memtrack/IMemtrack.aidl

+22 −7

Original line number	Original line	Diff line number	Diff line
	///////////////////////////////////////////////////////////////////////////////		/*
			* Copyright (C) 2020 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 IMMUTABLE. DO NOT EDIT IN ANY CASE. //
	///////////////////////////////////////////////////////////////////////////////		///////////////////////////////////////////////////////////////////////////////

	// This file is a snapshot of an AIDL interface (or parcelable). Do not try to		// This file is a snapshot of an AIDL file. Do not edit it manually. There are
	// edit this file. It looks like you are doing that because you have modified		// two cases:
	// an AIDL interface in a backward-incompatible way, e.g., deleting a function		// 1). this is a frozen version file - do not edit this in any case.
	// from an interface or a field from a parcelable and it broke the build. That		// 2). this is a 'current' file. If you make a backwards compatible change to
	// breakage is intended.		// 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 changes to the AIDL files built		// 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		// 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		// 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		// independently updatable components of the system. If a device is shipped

memtrack/aidl/aidl_api/android.hardware.memtrack/current/android/hardware/memtrack/MemtrackRecord.aidl

+22 −7

Original line number	Original line	Diff line number	Diff line
	///////////////////////////////////////////////////////////////////////////////		/*
			* Copyright (C) 2020 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 IMMUTABLE. DO NOT EDIT IN ANY CASE. //
	///////////////////////////////////////////////////////////////////////////////		///////////////////////////////////////////////////////////////////////////////

	// This file is a snapshot of an AIDL interface (or parcelable). Do not try to		// This file is a snapshot of an AIDL file. Do not edit it manually. There are
	// edit this file. It looks like you are doing that because you have modified		// two cases:
	// an AIDL interface in a backward-incompatible way, e.g., deleting a function		// 1). this is a frozen version file - do not edit this in any case.
	// from an interface or a field from a parcelable and it broke the build. That		// 2). this is a 'current' file. If you make a backwards compatible change to
	// breakage is intended.		// 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 changes to the AIDL files built		// 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		// 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		// 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		// independently updatable components of the system. If a device is shipped

memtrack/aidl/aidl_api/android.hardware.memtrack/current/android/hardware/memtrack/MemtrackType.aidl

+22 −8

Original line number	Original line	Diff line number	Diff line
	///////////////////////////////////////////////////////////////////////////////		/*
			* Copyright (C) 2020 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 IMMUTABLE. DO NOT EDIT IN ANY CASE. //
	///////////////////////////////////////////////////////////////////////////////		///////////////////////////////////////////////////////////////////////////////

	// This file is a snapshot of an AIDL interface (or parcelable). Do not try to		// This file is a snapshot of an AIDL file. Do not edit it manually. There are
	// edit this file. It looks like you are doing that because you have modified		// two cases:
	// an AIDL interface in a backward-incompatible way, e.g., deleting a function		// 1). this is a frozen version file - do not edit this in any case.
	// from an interface or a field from a parcelable and it broke the build. That		// 2). this is a 'current' file. If you make a backwards compatible change to
	// breakage is intended.		// 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 changes to the AIDL files built		// 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		// 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		// 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		// independently updatable components of the system. If a device is shipped
	@@ -23,5 +38,4 @@ enum MemtrackType {
	GRAPHICS = 2,		GRAPHICS = 2,
	MULTIMEDIA = 3,		MULTIMEDIA = 3,
	CAMERA = 4,		CAMERA = 4,
	NUM_TYPES = 5,
	}		}

memtrack/aidl/android/hardware/memtrack/MemtrackType.aidl

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -27,5 +27,4 @@ enum MemtrackType {
	GRAPHICS = 2,		GRAPHICS = 2,
	MULTIMEDIA = 3,		MULTIMEDIA = 3,
	CAMERA = 4,		CAMERA = 4,
	NUM_TYPES,
	}		}