diff --git a/api/current.txt b/api/current.txt
index 547108439f13c..4961312f2dd52 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -15863,6 +15863,7 @@ package android.hardware.fingerprint {
     field public static final int FINGERPRINT_ERROR_NO_SPACE = 4; // 0x4
     field public static final int FINGERPRINT_ERROR_TIMEOUT = 3; // 0x3
     field public static final int FINGERPRINT_ERROR_UNABLE_TO_PROCESS = 2; // 0x2
+    field public static final int FINGERPRINT_ERROR_USER_CANCELED = 10; // 0xa
     field public static final int FINGERPRINT_ERROR_VENDOR = 8; // 0x8
   }
 
diff --git a/api/system-current.txt b/api/system-current.txt
index b7b00f17d73c6..e867245513289 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -16614,6 +16614,7 @@ package android.hardware.fingerprint {
     field public static final int FINGERPRINT_ERROR_NO_SPACE = 4; // 0x4
     field public static final int FINGERPRINT_ERROR_TIMEOUT = 3; // 0x3
     field public static final int FINGERPRINT_ERROR_UNABLE_TO_PROCESS = 2; // 0x2
+    field public static final int FINGERPRINT_ERROR_USER_CANCELED = 10; // 0xa
     field public static final int FINGERPRINT_ERROR_VENDOR = 8; // 0x8
   }
 
diff --git a/api/test-current.txt b/api/test-current.txt
index 1708780961eb8..62f8885cee202 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -15949,6 +15949,7 @@ package android.hardware.fingerprint {
     field public static final int FINGERPRINT_ERROR_NO_SPACE = 4; // 0x4
     field public static final int FINGERPRINT_ERROR_TIMEOUT = 3; // 0x3
     field public static final int FINGERPRINT_ERROR_UNABLE_TO_PROCESS = 2; // 0x2
+    field public static final int FINGERPRINT_ERROR_USER_CANCELED = 10; // 0xa
     field public static final int FINGERPRINT_ERROR_VENDOR = 8; // 0x8
   }
 
diff --git a/core/java/android/hardware/fingerprint/FingerprintManager.java b/core/java/android/hardware/fingerprint/FingerprintManager.java
index 8b6f9c1bbdd2e..987718a82c47a 100644
--- a/core/java/android/hardware/fingerprint/FingerprintManager.java
+++ b/core/java/android/hardware/fingerprint/FingerprintManager.java
@@ -127,6 +127,13 @@ public class FingerprintManager {
      */
     public static final int FINGERPRINT_ERROR_LOCKOUT_PERMANENT = 9;
 
+    /**
+     * The user canceled the operation. Upon receiving this, applications should use alternate
+     * authentication (e.g. a password). The application should also provide the means to return
+     * to fingerprint authentication, such as a "use fingerprint" button.
+     */
+    public static final int FINGERPRINT_ERROR_USER_CANCELED = 10;
+
     /**
      * @hide
      */