Merge "SideFPS UX updates" into tm-qpr-dev (2ff2a64c) · Commits · e / os / android_frameworks_base

core/java/android/hardware/biometrics/BiometricConstants.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -156,6 +156,11 @@ public interface BiometricConstants {
		*/
		int BIOMETRIC_ERROR_SENSOR_PRIVACY_ENABLED = 18;

		/**
		* A power press stopped this biometric operation.
		* @hide
		*/
		int BIOMETRIC_ERROR_POWER_PRESSED = 19;
		/**
		* This constant is only used by SystemUI. It notifies SystemUI that authentication was paused
		* because the authentication attempt was unsuccessful.

+7 −0

Original line number	Diff line number	Diff line
		@@ -70,6 +70,7 @@ public interface BiometricFaceConstants {
		BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED,
		BIOMETRIC_ERROR_RE_ENROLL,
		FACE_ERROR_UNKNOWN,
		BIOMETRIC_ERROR_POWER_PRESSED,
		})
		@Retention(RetentionPolicy.SOURCE)
		@interface FaceError {}
		@@ -183,6 +184,12 @@ public interface BiometricFaceConstants {
		*/
		int FACE_ERROR_UNKNOWN = 17;

		/**
		* A power press stopped this biometric operation.
		* @hide
		*/
		int BIOMETRIC_ERROR_POWER_PRESSED = 19;

		/**
		* Vendor codes received from the HAL start at 0. Codes that the framework exposes to keyguard
		* append this value for some reason. We should probably remove this and just send the actual

+8 −1

Original line number	Diff line number	Diff line
		@@ -61,7 +61,8 @@ public interface BiometricFingerprintConstants {
		BIOMETRIC_ERROR_RE_ENROLL,
		BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED,
		FINGERPRINT_ERROR_UNKNOWN,
		FINGERPRINT_ERROR_BAD_CALIBRATION})
		FINGERPRINT_ERROR_BAD_CALIBRATION,
		BIOMETRIC_ERROR_POWER_PRESSED})
		@Retention(RetentionPolicy.SOURCE)
		@interface FingerprintError {}

		@@ -187,6 +188,12 @@ public interface BiometricFingerprintConstants {
		*/
		int FINGERPRINT_ERROR_BAD_CALIBRATION = 18;

		/**
		* A power press stopped this biometric operation.
		* @hide
		*/
		int BIOMETRIC_ERROR_POWER_PRESSED = 19;

		/**
		* @hide
		*/

+15 −0

Original line number	Diff line number	Diff line
		@@ -46,6 +46,14 @@ public abstract class BiometricStateListener extends IBiometricStateListener.Stu
		public @interface State {
		}

		// The sensor received a touch.
		public static final int ACTION_SENSOR_TOUCH = 0;

		@IntDef({ACTION_SENSOR_TOUCH})
		@Retention(RetentionPolicy.SOURCE)
		public @interface Action {
		}

		/**
		* Defines behavior in response to state update
		* @param newState new state of the biometric sensor
		@@ -53,6 +61,13 @@ public abstract class BiometricStateListener extends IBiometricStateListener.Stu
		public void onStateChanged(@BiometricStateListener.State int newState) {
		}


		/**
		* Invoked when a biometric action has occurred.
		*/
		public void onBiometricAction(@BiometricStateListener.Action int action) {
		}

		/**
		* Invoked when enrollment state changes for the specified user
		*/

+1 −0

Original line number	Diff line number	Diff line
		@@ -22,5 +22,6 @@ package android.hardware.biometrics;
		*/
		oneway interface IBiometricStateListener {
		void onStateChanged(int newState);
		void onBiometricAction(int action);
		void onEnrollmentsChanged(int userId, int sensorId, boolean hasEnrollments);
		}