Merge changes from topic "IFace-anapic-review" into sc-dev am: a6d4024cb2 (922a32e9) · Commits · e / os / android_hardware_interfaces

biometrics/fingerprint/aidl/aidl_api/android.hardware.biometrics.fingerprint/current/android/hardware/biometrics/fingerprint/AcquiredInfo.aidl

+13 −12

Original line number	Diff line number	Diff line
		@@ -34,16 +34,17 @@
		package android.hardware.biometrics.fingerprint;
		@Backing(type="byte") @VintfStability
		enum AcquiredInfo {
		GOOD = 0,
		PARTIAL = 1,
		INSUFFICIENT = 2,
		SENSOR_DIRTY = 3,
		TOO_SLOW = 4,
		TOO_FAST = 5,
		VENDOR = 6,
		START = 7,
		TOO_DARK = 8,
		TOO_BRIGHT = 9,
		IMMOBILE = 10,
		RETRYING_CAPTURE = 11,
		UNKNOWN = 0,
		GOOD = 1,
		PARTIAL = 2,
		INSUFFICIENT = 3,
		SENSOR_DIRTY = 4,
		TOO_SLOW = 5,
		TOO_FAST = 6,
		VENDOR = 7,
		START = 8,
		TOO_DARK = 9,
		TOO_BRIGHT = 10,
		IMMOBILE = 11,
		RETRYING_CAPTURE = 12,
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -34,11 +34,12 @@
		package android.hardware.biometrics.fingerprint;
		@Backing(type="byte") @VintfStability
		enum Error {
		UNKNOWN = 0,
		HW_UNAVAILABLE = 1,
		UNABLE_TO_PROCESS = 2,
		TIMEOUT = 3,
		NO_SPACE = 4,
		CANCELED = 5,
		UNABLE_TO_REMOVE = 6,
		VENDOR = 8,
		VENDOR = 7,
		}

+7 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,13 @@ package android.hardware.biometrics.fingerprint;
		@VintfStability
		@Backing(type="byte")
		enum AcquiredInfo {
		/**
		* Placeholder value used for default initialization of AcquiredInfo. This
		* value means AcquiredInfo wasn't explicitly initialized and must be
		* discarded by the recipient.
		*/
		UNKNOWN,

		/**
		* A high quality fingerprint image was detected, no further user interaction is necessary.
		*/

+11 −21

Original line number	Diff line number	Diff line
		@@ -20,57 +20,47 @@ package android.hardware.biometrics.fingerprint;
		@Backing(type="byte")
		enum Error {
		/**
		* Used for testing, and to keep subsequent numbering consistent with older HIDLs.
		* Placeholder value used for default initialization of Error. This value
		* means Error wasn't explicitly initialized and must be discarded by the
		* recipient.
		*/
		// NO_ERROR = 0,
		UNKNOWN,

		/**
		* A hardware error has occurred that cannot be resolved. For example, I2C failure or a broken
		* sensor.
		*/
		HW_UNAVAILABLE = 1,
		HW_UNAVAILABLE,

		/**
		* The implementation is unable to process the request. For example, invalid arguments were
		* supplied.
		*/
		UNABLE_TO_PROCESS = 2,
		UNABLE_TO_PROCESS,

		/**
		* The current operation took too long to complete.
		*/
		TIMEOUT = 3,
		TIMEOUT,

		/**
		* No space available to store additional enrollments.
		*/
		NO_SPACE = 4,
		NO_SPACE,

		/**
		* The operation was canceled. See common::ICancellationSignal.
		*/
		CANCELED = 5,
		CANCELED,

		/**
		* The implementation was unable to remove an enrollment.
		* See ISession#removeEnrollments.
		*/
		UNABLE_TO_REMOVE = 6,

		/**
		* Reserved to maintain backwards compatibility. See ISessionCallback#onLockoutTimed instead.
		*/
		// LOCKOUT = 7,
		UNABLE_TO_REMOVE,

		/**
		* Used to enable vendor-specific error messages.
		*/
		VENDOR = 8,

		/**
		* Reserved to maintain backwards compatibility. See ISessionCallback#onLockoutPermanent
		* instead.
		*/
		// LOCKOUT_PERMANENT = 9,
		VENDOR,
		}

+0 −1

Original line number	Diff line number	Diff line
		@@ -26,4 +26,3 @@ enum FingerprintSensorType {
		POWER_BUTTON,
		HOME_BUTTON
		}