Clean up FingerprintManager API and make it public. (ce7eb6da) · Commits · e / os / android_frameworks_base

api/current.txt

+48 −0

Original line number	Diff line number	Diff line
		@@ -7629,6 +7629,7 @@ 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";
		@@ -13685,6 +13686,53 @@ package android.hardware.display {

		}

		package android.hardware.fingerprint {

		public final class Fingerprint implements android.os.Parcelable {
		ctor public Fingerprint(java.lang.CharSequence, int, int, long);
		method public int describeContents();
		method public java.lang.CharSequence getName();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.hardware.fingerprint.Fingerprint> CREATOR;
		}

		public class FingerprintManager {
		method public void authenticate(android.hardware.fingerprint.FingerprintManager.CryptoObject, android.os.CancellationSignal, android.hardware.fingerprint.FingerprintManager.AuthenticationCallback, int);
		field public static final int FINGERPRINT_ACQUIRED_GOOD = 0; // 0x0
		field public static final int FINGERPRINT_ACQUIRED_IMAGER_DIRTY = 3; // 0x3
		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 = 5; // 0x5
		field public static final int FINGERPRINT_ACQUIRED_TOO_SLOW = 4; // 0x4
		field public static final int FINGERPRINT_ACQUIRED_VENDOR_BASE = 1000; // 0x3e8
		field public static final int FINGERPRINT_ERROR_CANCELED = 5; // 0x5
		field public static final int FINGERPRINT_ERROR_HW_UNAVAILABLE = 1; // 0x1
		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_VENDOR_BASE = 1000; // 0x3e8
		}

		public static abstract class FingerprintManager.AuthenticationCallback {
		ctor public FingerprintManager.AuthenticationCallback();
		method public void onAuthenticationError(int, java.lang.CharSequence);
		method public void onAuthenticationFailed();
		method public void onAuthenticationHelp(int, java.lang.CharSequence);
		method public void onAuthenticationSucceeded(android.hardware.fingerprint.FingerprintManager.AuthenticationResult);
		}

		public static final class FingerprintManager.AuthenticationResult {
		ctor public FingerprintManager.AuthenticationResult(android.hardware.fingerprint.FingerprintManager.CryptoObject, android.hardware.fingerprint.Fingerprint);
		method public android.hardware.fingerprint.FingerprintManager.CryptoObject getCryptoObject();
		}

		public static class FingerprintManager.CryptoObject {
		method public javax.crypto.Cipher getCipher();
		method public java.security.Signature getSignature();
		}

		}

		package android.hardware.input {

		public final class InputManager {

api/system-current.txt

+48 −0

Original line number	Diff line number	Diff line
		@@ -7842,6 +7842,7 @@ 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 HDMI_CONTROL_SERVICE = "hdmi_control";
		field public static final java.lang.String INPUT_METHOD_SERVICE = "input_method";
		field public static final java.lang.String INPUT_SERVICE = "input";
		@@ -13978,6 +13979,53 @@ package android.hardware.display {

		}

		package android.hardware.fingerprint {

		public final class Fingerprint implements android.os.Parcelable {
		ctor public Fingerprint(java.lang.CharSequence, int, int, long);
		method public int describeContents();
		method public java.lang.CharSequence getName();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.hardware.fingerprint.Fingerprint> CREATOR;
		}

		public class FingerprintManager {
		method public void authenticate(android.hardware.fingerprint.FingerprintManager.CryptoObject, android.os.CancellationSignal, android.hardware.fingerprint.FingerprintManager.AuthenticationCallback, int);
		field public static final int FINGERPRINT_ACQUIRED_GOOD = 0; // 0x0
		field public static final int FINGERPRINT_ACQUIRED_IMAGER_DIRTY = 3; // 0x3
		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 = 5; // 0x5
		field public static final int FINGERPRINT_ACQUIRED_TOO_SLOW = 4; // 0x4
		field public static final int FINGERPRINT_ACQUIRED_VENDOR_BASE = 1000; // 0x3e8
		field public static final int FINGERPRINT_ERROR_CANCELED = 5; // 0x5
		field public static final int FINGERPRINT_ERROR_HW_UNAVAILABLE = 1; // 0x1
		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_VENDOR_BASE = 1000; // 0x3e8
		}

		public static abstract class FingerprintManager.AuthenticationCallback {
		ctor public FingerprintManager.AuthenticationCallback();
		method public void onAuthenticationError(int, java.lang.CharSequence);
		method public void onAuthenticationFailed();
		method public void onAuthenticationHelp(int, java.lang.CharSequence);
		method public void onAuthenticationSucceeded(android.hardware.fingerprint.FingerprintManager.AuthenticationResult);
		}

		public static final class FingerprintManager.AuthenticationResult {
		ctor public FingerprintManager.AuthenticationResult(android.hardware.fingerprint.FingerprintManager.CryptoObject, android.hardware.fingerprint.Fingerprint);
		method public android.hardware.fingerprint.FingerprintManager.CryptoObject getCryptoObject();
		}

		public static class FingerprintManager.CryptoObject {
		method public javax.crypto.Cipher getCipher();
		method public java.security.Signature getSignature();
		}

		}

		package android.hardware.hdmi {

		public abstract class HdmiClient {

core/java/android/content/Context.java

+3 −4

Original line number	Diff line number	Diff line
		@@ -2161,7 +2161,7 @@ public abstract class Context {
		WIFI_RTT_SERVICE,
		NSD_SERVICE,
		AUDIO_SERVICE,
		//@hide: FINGERPRINT_SERVICE,
		FINGERPRINT_SERVICE,
		MEDIA_ROUTER_SERVICE,
		TELEPHONY_SERVICE,
		TELEPHONY_SUBSCRIPTION_SERVICE,
		@@ -2668,12 +2668,11 @@ public abstract class Context {

		/**
		* Use with {@link #getSystemService} to retrieve a
		* {@link android.service.fingerprint.FingerprintManager} for handling management
		* {@link android.hardware.fingerprint.FingerprintManager} for handling management
		* of fingerprints.
		*
		* @see #getSystemService
		* @see android.service.fingerprint.FingerprintManager
		* @hide
		* @see android.hardware.fingerprint.FingerprintManager
		*/
		public static final String FINGERPRINT_SERVICE = "fingerprint";

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

+350 −163

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/hardware/fingerprint/IFingerprintService.aidl

+14 −9

Original line number	Diff line number	Diff line
		@@ -26,13 +26,21 @@ import java.util.List;
		*/
		interface IFingerprintService {
		// Authenticate the given sessionId with a fingerprint
		void authenticate(IBinder token, long sessionId, int groupId, int flags);
		void authenticate(IBinder token, long sessionId, int groupId,
		IFingerprintServiceReceiver receiver, int flags);

		// Cancel authentication for the given sessionId
		void cancelAuthentication(IBinder token);

		// Start fingerprint enrollment
		void enroll(IBinder token, int groupId, int flags);
		void enroll(IBinder token, long challenge, int groupId, IFingerprintServiceReceiver receiver,
		int flags);

		// Cancel enrollment in progress
		void cancelEnrollment(IBinder token);

		// Any errors resulting from this call will be returned to the listener
		void remove(IBinder token, int fingerId, int groupId);
		void remove(IBinder token, int fingerId, int groupId, IFingerprintServiceReceiver receiver);

		// Rename the fingerprint specified by fingerId and groupId to the given name
		void rename(int fingerId, int groupId, String name);
		@@ -40,15 +48,12 @@ interface IFingerprintService {
		// Get a list of enrolled fingerprints in the given group.
		List<Fingerprint> getEnrolledFingerprints(int groupId);

		// Register listener for an instance of FingerprintManager
		void addListener(IBinder token, IFingerprintServiceReceiver receiver, int userId);

		// Unregister listener for an instance of FingerprintManager
		void removeListener(IBinder token, IFingerprintServiceReceiver receiver);

		// Determine if HAL is loaded and ready
		boolean isHardwareDetected(long deviceId);

		// Get a pre-enrollment authentication token
		long preEnroll(IBinder token);

		// Gets the number of hardware devices
		// int getHardwareDeviceCount();