Merge "Hide fingerprint API until new API is ready" into lmp-dev (e7b6b1aa) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −46

Original line number	Diff line number	Diff line
		@@ -7338,7 +7338,6 @@ package android.content {
		field public static final java.lang.String DISPLAY_SERVICE = "display";
		field public static final java.lang.String DOWNLOAD_SERVICE = "download";
		field public static final java.lang.String DROPBOX_SERVICE = "dropbox";
		field public static final java.lang.String FINGERPRINT_SERVICE = "fingerprint";
		field public static final java.lang.String INPUT_METHOD_SERVICE = "input_method";
		field public static final java.lang.String INPUT_SERVICE = "input";
		field public static final java.lang.String JOB_SCHEDULER_SERVICE = "jobscheduler";
		@@ -27091,51 +27090,6 @@ package android.service.dreams {

		}

		package android.service.fingerprint {

		public class FingerprintManager {
		method public void enroll(long);
		method public void enrollCancel();
		method public boolean enrolledAndEnabled();
		method public void remove(int);
		method public void startListening(android.service.fingerprint.FingerprintManagerReceiver);
		method public void stopListening();
		field public static final int FINGERPRINT_ACQUIRED = 1; // 0x1
		field public static final int FINGERPRINT_ACQUIRED_GOOD = 0; // 0x0
		field public static final int FINGERPRINT_ACQUIRED_IMAGER_DIRTY = 4; // 0x4
		field public static final int FINGERPRINT_ACQUIRED_INSUFFICIENT = 2; // 0x2
		field public static final int FINGERPRINT_ACQUIRED_PARTIAL = 1; // 0x1
		field public static final int FINGERPRINT_ACQUIRED_TOO_FAST = 16; // 0x10
		field public static final int FINGERPRINT_ACQUIRED_TOO_SLOW = 8; // 0x8
		field public static final int FINGERPRINT_ERROR = -1; // 0xffffffff
		field public static final int FINGERPRINT_ERROR_HW_UNAVAILABLE = 1; // 0x1
		field public static final int FINGERPRINT_ERROR_NO_RECEIVER = -10; // 0xfffffff6
		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_PROCESSED = 2; // 0x2
		field public static final int FINGERPRINT_TEMPLATE_ENROLLING = 3; // 0x3
		field public static final int FINGERPRINT_TEMPLATE_REMOVED = 4; // 0x4
		}

		public class FingerprintManagerReceiver {
		ctor public FingerprintManagerReceiver();
		method public void onAcquired(int);
		method public void onEnrollResult(int, int);
		method public void onError(int);
		method public void onProcessed(int);
		method public void onRemoved(int);
		}

		public class FingerprintUtils {
		ctor public FingerprintUtils();
		method public static void addFingerprintIdForUser(int, android.content.ContentResolver, int);
		method public static int[] getFingerprintIdsForUser(android.content.ContentResolver, int);
		method public static boolean removeFingerprintIdForUser(int, android.content.ContentResolver, int);
		}

		}

		package android.service.notification {

		public abstract class NotificationListenerService extends android.app.Service {

core/java/android/content/Context.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -2512,6 +2512,7 @@ public abstract class Context {
		*
		* @see #getSystemService
		* @see android.app.FingerprintManager
		* @hide
		*/
		public static final String FINGERPRINT_SERVICE = "fingerprint";

core/java/android/service/fingerprint/FingerprintManager.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,7 @@ import android.util.Slog;

		/**
		* A class that coordinates access to the fingerprint hardware.
		* @hide
		*/

		public class FingerprintManager {

core/java/android/service/fingerprint/FingerprintManagerReceiver.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,9 @@ package android.service.fingerprint;
		* limitations under the License.
		*/

		/**
		* @hide
		*/
		public class FingerprintManagerReceiver {
		/**
		* Fingerprint enrollment progress update. Enrollment is considered complete if

core/java/android/service/fingerprint/FingerprintUtils.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,10 @@ import android.util.Log;

		import java.util.Arrays;

		/**
		* Utility class for dealing with fingerprints and fingerprint settings.
		* @hide
		*/
		public
		class FingerprintUtils {
		private static final boolean DEBUG = true;