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

Commit ed282ac9 authored by Ilya Matyukhin's avatar Ilya Matyukhin Committed by Android (Google) Code Review
Browse files

Merge "Move [generate|revoke]Challenge under ISession.aidl"

parents 7e710964 3d54f457

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

+0 −2
Original line number Diff line number Diff line
@@ -20,6 +20,4 @@ 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 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/IGenerateChallengeCallback.aidl

deleted100644 → 0
+0 −22
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 IGenerateChallengeCallback {

  oneway void onChallengeGenerated(in int sensorId, in int userId, in long challenge);

}

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

deleted100644 → 0
+0 −22
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 IRevokeChallengeCallback {

  oneway void onChallengeRevoked(in int sensorId, in int userId, in long challenge);

}

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

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

@VintfStability

interface ISession {

  void generateChallenge(in int cookie, in int timeoutSec);

  void revokeChallenge(in int cookie, in long challenge);

  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 operationId);

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

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

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ package android.hardware.biometrics.fingerprint; 
@VintfStability

interface ISessionCallback {

  void onStateChanged(in int cookie, in android.hardware.biometrics.fingerprint.SessionState state);

  void onChallengeGenerated(in long challenge);

  void onChallengeRevoked(in long challenge);

  void onAcquired(in android.hardware.biometrics.fingerprint.AcquiredInfo info, in int vendorCode);

  void onError(in android.hardware.biometrics.fingerprint.Error error, in int vendorCode);

  void onEnrollmentProgress(in int enrollmentId, int remaining);