diff options
| author | Joshua Mccloskey <joshmccloskey@google.com> | 2021-12-08 07:26:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-12-08 07:26:21 +0000 |
| commit | fa02344fe01bbe163136ba8cb06d6076e16aaa6d (patch) | |
| tree | 83c2190459aaa9a24449b07a24a747e1ebc9a60a /core/java | |
| parent | 6e8a545bff922ee6eeb5966f05321aceb72bb5fb (diff) | |
| parent | 698f40caf747fe8f8bc9cfe1175fda3e1ee517b9 (diff) | |
Merge changes from topic "faceCameraSensorPrivacy" into sc-v2-dev am: 698f40caf7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16285463
Change-Id: I9982667e2035ad3d88a614b4ed5e8d5747c42ed4
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/hardware/biometrics/BiometricConstants.java | 6 | ||||
| -rw-r--r-- | core/java/android/hardware/biometrics/BiometricFaceConstants.java | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/core/java/android/hardware/biometrics/BiometricConstants.java b/core/java/android/hardware/biometrics/BiometricConstants.java index 43ef33e1f420..28046c56b9f8 100644 --- a/core/java/android/hardware/biometrics/BiometricConstants.java +++ b/core/java/android/hardware/biometrics/BiometricConstants.java @@ -151,6 +151,12 @@ public interface BiometricConstants { int BIOMETRIC_ERROR_RE_ENROLL = 16; /** + * The privacy setting has been enabled and will block use of the sensor. + * @hide + */ + int BIOMETRIC_ERROR_SENSOR_PRIVACY_ENABLED = 18; + + /** * This constant is only used by SystemUI. It notifies SystemUI that authentication was paused * because the authentication attempt was unsuccessful. * @hide diff --git a/core/java/android/hardware/biometrics/BiometricFaceConstants.java b/core/java/android/hardware/biometrics/BiometricFaceConstants.java index fe43c83d17f1..fd46f243874b 100644 --- a/core/java/android/hardware/biometrics/BiometricFaceConstants.java +++ b/core/java/android/hardware/biometrics/BiometricFaceConstants.java @@ -69,7 +69,7 @@ public interface BiometricFaceConstants { BIOMETRIC_ERROR_NO_DEVICE_CREDENTIAL, BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED, BIOMETRIC_ERROR_RE_ENROLL, - FACE_ERROR_UNKNOWN + FACE_ERROR_UNKNOWN, }) @Retention(RetentionPolicy.SOURCE) @interface FaceError {} |