Merge "Update fingerprint AIDL for Android U" into udc-dev (36d5fb13) · Commits · e / os / android_hardware_interfaces

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

+14 −13

Original line number	Diff line number	Diff line
		@@ -35,17 +35,18 @@ package android.hardware.biometrics.fingerprint;
		/* @hide */
		@Backing(type="byte") @VintfStability
		enum AcquiredInfo {
		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,
		UNKNOWN,
		GOOD,
		PARTIAL,
		INSUFFICIENT,
		SENSOR_DIRTY,
		TOO_SLOW,
		TOO_FAST,
		VENDOR,
		START,
		TOO_DARK,
		TOO_BRIGHT,
		IMMOBILE,
		RETRYING_CAPTURE,
		LIFT_TOO_SOON,
		}

+9 −9

Original line number	Diff line number	Diff line
		@@ -35,13 +35,13 @@ package android.hardware.biometrics.fingerprint;
		/* @hide */
		@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 = 7,
		BAD_CALIBRATION = 8,
		UNKNOWN,
		HW_UNAVAILABLE,
		UNABLE_TO_PROCESS,
		TIMEOUT,
		NO_SPACE,
		CANCELED,
		UNABLE_TO_REMOVE,
		VENDOR,
		BAD_CALIBRATION,
		}

+6 −6

Original line number	Diff line number	Diff line
		@@ -35,10 +35,10 @@ package android.hardware.biometrics.fingerprint;
		/* @hide */
		@Backing(type="byte") @VintfStability
		enum FingerprintSensorType {
		UNKNOWN = 0,
		REAR = 1,
		UNDER_DISPLAY_ULTRASONIC = 2,
		UNDER_DISPLAY_OPTICAL = 3,
		POWER_BUTTON = 4,
		HOME_BUTTON = 5,
		UNKNOWN,
		REAR,
		UNDER_DISPLAY_ULTRASONIC,
		UNDER_DISPLAY_OPTICAL,
		POWER_BUTTON,
		HOME_BUTTON,
		}

+8 −0

Original line number	Diff line number	Diff line
		@@ -46,7 +46,13 @@ interface ISession {
		void invalidateAuthenticatorId();
		void resetLockout(in android.hardware.keymaster.HardwareAuthToken hat);
		void close();
		/**
		* @deprecated use onPointerDownWithContext instead.
		*/
		void onPointerDown(in int pointerId, in int x, in int y, in float minor, in float major);
		/**
		* @deprecated use onPointerUpWithContext instead.
		*/
		void onPointerUp(in int pointerId);
		void onUiReady();
		android.hardware.biometrics.common.ICancellationSignal authenticateWithContext(in long operationId, in android.hardware.biometrics.common.OperationContext context);
		@@ -55,4 +61,6 @@ interface ISession {
		void onPointerDownWithContext(in android.hardware.biometrics.fingerprint.PointerContext context);
		void onPointerUpWithContext(in android.hardware.biometrics.fingerprint.PointerContext context);
		void onContextChanged(in android.hardware.biometrics.common.OperationContext context);
		void onPointerCancelWithContext(in android.hardware.biometrics.fingerprint.PointerContext context);
		void setIgnoreDisplayTouches(in boolean shouldIgnore);
		}

+6 −6

Original line number	Diff line number	Diff line
		@@ -35,12 +35,12 @@ package android.hardware.biometrics.fingerprint;
		/* @hide */
		@JavaDerive(equals=true) @VintfStability
		parcelable PointerContext {
		int pointerId = -1;
		float x = 0.000000f;
		float y = 0.000000f;
		float minor = 0.000000f;
		float major = 0.000000f;
		float orientation = 0.000000f;
		int pointerId = (-1) /* -1 */;
		float x = 0f;
		float y = 0f;
		float minor = 0f;
		float major = 0f;
		float orientation = 0f;
		boolean isAod = false;
		long time = 0;
		long gestureStart = 0;