Merge "Revert "Freezing face api"" into main (30f558a8) · Commits · e / os / android_hardware_interfaces

biometrics/face/aidl/Android.bp

+1 −9

Original line number	Original line	Diff line number	Diff line
	@@ -60,16 +60,8 @@ aidl_interface {
	"android.hardware.keymaster-V4",		"android.hardware.keymaster-V4",
	],		],
	},		},
	{
	version: "4",
	imports: [
	"android.hardware.biometrics.common-V3",
	"android.hardware.common-V2",
	"android.hardware.keymaster-V4",
	],
	},

	],		],
	frozen: true,		frozen: false,

	}		}

biometrics/face/aidl/aidl_api/android.hardware.biometrics.face/4/.hash

deleted100644 → 0

+0 −1

Original line number	Original line	Diff line number	Diff line
	33be703fa4cde5f04f976fa3f29d15fa4f3e70c5

biometrics/face/aidl/aidl_api/android.hardware.biometrics.face/4/android/hardware/biometrics/face/AcquiredInfo.aidl

deleted100644 → 0

+0 −64

Original line number	Original line	Diff line number	Diff line
	/*
	* 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.biometrics.face;
	@Backing(type="byte") @VintfStability
	enum AcquiredInfo {
	UNKNOWN,
	GOOD,
	INSUFFICIENT,
	TOO_BRIGHT,
	TOO_DARK,
	TOO_CLOSE,
	TOO_FAR,
	FACE_TOO_HIGH,
	FACE_TOO_LOW,
	FACE_TOO_RIGHT,
	FACE_TOO_LEFT,
	POOR_GAZE,
	NOT_DETECTED,
	TOO_MUCH_MOTION,
	RECALIBRATE,
	TOO_DIFFERENT,
	TOO_SIMILAR,
	PAN_TOO_EXTREME,
	TILT_TOO_EXTREME,
	ROLL_TOO_EXTREME,
	FACE_OBSCURED,
	START,
	SENSOR_DIRTY,
	VENDOR,
	FIRST_FRAME_RECEIVED,
	DARK_GLASSES_DETECTED,
	MOUTH_COVERING_DETECTED,
	}

biometrics/face/aidl/aidl_api/android.hardware.biometrics.face/4/android/hardware/biometrics/face/AuthenticationFrame.aidl

deleted100644 → 0

+0 −38

Original line number	Original line	Diff line number	Diff line
	/*
	* 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.biometrics.face;
	@VintfStability
	parcelable AuthenticationFrame {
	android.hardware.biometrics.face.BaseFrame data;
	}

biometrics/face/aidl/aidl_api/android.hardware.biometrics.face/4/android/hardware/biometrics/face/BaseFrame.aidl

deleted100644 → 0

+0 −43

Original line number	Original line	Diff line number	Diff line
	/*
	* 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.biometrics.face;
	@VintfStability
	parcelable BaseFrame {
	android.hardware.biometrics.face.AcquiredInfo acquiredInfo = android.hardware.biometrics.face.AcquiredInfo.UNKNOWN;
	int vendorCode;
	float pan;
	float tilt;
	float distance;
	boolean isCancellable;
	}