commit fb8e9b90961fa12af8ac54779d8041e80ebf6b06
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Aug 30 17:47:46 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 30 17:47:46 2017 +0000
tree 858acad0a81f9ef6f5f84f937cd72eeb6b01bf92
parent f4a484064bd015c3762f06b4563c5fc34586f2c5
parent a8bc97cd70e6ccc25b1117a49e9bebf958fd5e06

Merge "Add a constant to allow system-provided fingerprint dialogs" into oc-mr1-dev

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 5471084..4961312 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -15863,6 +15863,7 @@
     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
   }
 

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index b7b00f1..e867245 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -16614,6 +16614,7 @@
     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
   }
 

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index 1708780..62f8885 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -15949,6 +15949,7 @@
     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
   }
 

core/java/android/hardware/fingerprint/FingerprintManager.java

diff --git a/core/java/android/hardware/fingerprint/FingerprintManager.java b/core/java/android/hardware/fingerprint/FingerprintManager.java
index 8b6f9c1..987718a 100644
--- a/core/java/android/hardware/fingerprint/FingerprintManager.java
+++ b/core/java/android/hardware/fingerprint/FingerprintManager.java
@@ -128,6 +128,13 @@
     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
      */
     public static final int FINGERPRINT_ERROR_VENDOR_BASE = 1000;