Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac378f41 authored by Kevin Chyn's avatar Kevin Chyn Committed by Android (Google) Code Review
Browse files

Merge changes I0b7e7ab3,I92db9b22,I24615333,I7ca0365b 

* changes:
  Move lockout callbacks to ISessionCallback
  Finish remainder of documentation.
  Minor API changes and additional documentation for IFingerprint
  Update fingerprint #authenticate interfaces & documentation
parents 8fa716a7 ef79d661

biometrics/fingerprint/aidl/aidl_api/android.hardware.biometrics.fingerprint/current/android/hardware/biometrics/fingerprint/AcquiredInfo.aidl

+2 −2
Original line number Diff line number Diff line
@@ -24,6 +24,6 @@ enum AcquiredInfo { 
  SENSOR_DIRTY = 3,

  TOO_SLOW = 4,

  TOO_FAST = 5,

  START = 6,

  VENDOR = 7,

  VENDOR = 6,

  START = 7,

}

biometrics/fingerprint/aidl/aidl_api/android.hardware.biometrics.fingerprint/current/android/hardware/biometrics/fingerprint/Error.aidl

+6 −8
Original line number Diff line number Diff line
@@ -18,13 +18,11 @@ 
package android.hardware.biometrics.fingerprint;

@Backing(type="byte") @VintfStability

enum Error {

  HW_UNAVAILABLE = 0,

  UNABLE_TO_PROCESS = 1,

  TIMEOUT = 2,

  NO_SPACE = 3,

  CANCELED = 4,

  UNABLE_TO_REMOVE = 5,

  LOCKOUT = 6,

  LOCKOUT_PERMANENT = 7,

  HW_UNAVAILABLE = 1,

  UNABLE_TO_PROCESS = 2,

  TIMEOUT = 3,

  NO_SPACE = 4,

  CANCELED = 5,

  UNABLE_TO_REMOVE = 6,

  VENDOR = 8,

}

biometrics/fingerprint/aidl/aidl_api/android.hardware.biometrics.fingerprint/current/android/hardware/biometrics/fingerprint/IFingerprint.aidl

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ package android.hardware.biometrics.fingerprint; 
interface IFingerprint {

  android.hardware.biometrics.fingerprint.SensorProps[] getSensorProps();

  android.hardware.biometrics.fingerprint.ISession createSession(in int sensorId, in int userId, in android.hardware.biometrics.fingerprint.ISessionCallback cb);

  void setLockoutCallback(in android.hardware.biometrics.fingerprint.ILockoutCallback cb);

  void generateChallenge(in int sensorId, in int userId, in int timeoutSec, in android.hardware.biometrics.fingerprint.IGenerateChallengeCallback cb);

  void revokeChallenge(in int sensorId, in int userId, in long challenge, in android.hardware.biometrics.fingerprint.IRevokeChallengeCallback cb);

}

biometrics/fingerprint/aidl/aidl_api/android.hardware.biometrics.fingerprint/current/android/hardware/biometrics/fingerprint/ILockoutCallback.aidl

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////////

// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //

///////////////////////////////////////////////////////////////////////////////



// This file is a snapshot of an AIDL interface (or parcelable). Do not try to

// edit this file. It looks like you are doing that because you have modified

// an AIDL interface in a backward-incompatible way, e.g., deleting a function

// from an interface or a field from a parcelable and it broke the build. That

// breakage is intended.

//

// You must not make a backward incompatible changes to the AIDL files built

// with the aidl_interface module type with versions property set. The module

// type is used to build AIDL files in a way that they can be used across

// independently updatable components of the system. If a device is shipped

// with such a backward incompatible change, it has a high risk of breaking

// later when a module using the interface is updated, e.g., Mainline modules.



package android.hardware.biometrics.fingerprint;

@VintfStability

interface ILockoutCallback {

  oneway void onLockoutTimed(in int sensorId, in int userId, in long durationMillis);

  oneway void onLockoutPermanent(in int sensorId, in int userId);

  oneway void onLockoutCleared(in int sensorId, in int userId);

}

biometrics/fingerprint/aidl/aidl_api/android.hardware.biometrics.fingerprint/current/android/hardware/biometrics/fingerprint/ISession.aidl

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ package android.hardware.biometrics.fingerprint; 
@VintfStability

interface ISession {

  android.hardware.biometrics.common.ICancellationSignal enroll(in int cookie, in android.hardware.keymaster.HardwareAuthToken hat);

  android.hardware.biometrics.common.ICancellationSignal authenticate(in int cookie, in long keystoreOperationId);

  android.hardware.biometrics.common.ICancellationSignal authenticate(in int cookie, in long operationId);

  android.hardware.biometrics.common.ICancellationSignal detectInteraction(in int cookie);

  void enumerateEnrollments(in int cookie);

  void removeEnrollments(in int cookie, in int[] enrollmentIds);