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

Commit a6ec86af authored by Sasha Levitskiy's avatar Sasha Levitskiy Committed by Android Git Automerger
Browse files

am 6889cc64: am 70407ff4: am 1022fa9a: am ce3da983: am 12328ef4: Merge... 

am 6889cc64: am 70407ff4: am 1022fa9a: am ce3da983: am 12328ef4: Merge "Fingerprint: Add post enroll interface." into mnc-dev

* commit '6889cc64':
  Fingerprint: Add post enroll interface.
parents 9b0cae93 6889cc64

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

+15 −0
Original line number Diff line number Diff line
@@ -519,6 +519,21 @@ public class FingerprintManager { 
        return result;

    }



    /**

     * Finishes enrollment and cancels the current auth token.

     * @hide

     */

    @RequiresPermission(MANAGE_FINGERPRINT)

    public int postEnroll() {

        int result = 0;

        if (mService != null) try {

            result = mService.postEnroll(mToken);

        } catch (RemoteException e) {

            Log.w(TAG, "Remote exception in post enroll: ", e);

        }

        return result;

    }



    /**

     * Remove given fingerprint template from fingerprint hardware and/or protected storage.

     * @param fp the fingerprint item to remove

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

+2 −1
Original line number Diff line number Diff line
@@ -34,4 +34,5 @@ interface IFingerprintDaemon { 
    long openHal();

    int closeHal();

    void init(IFingerprintDaemonCallback callback);

    int postEnroll();

}

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

+3 −0
Original line number Diff line number Diff line
@@ -54,6 +54,9 @@ interface IFingerprintService { 
    // Get a pre-enrollment authentication token

    long preEnroll(IBinder token);



    // Finish an enrollment sequence and invalidate the authentication token

    int postEnroll(IBinder token);



    // Determine if a user has at least one enrolled fingerprint

    boolean hasEnrolledFingerprints(int groupId, String opPackageName);

services/core/java/com/android/server/fingerprint/FingerprintService.java

+20 −0
Original line number Diff line number Diff line
@@ -301,6 +301,20 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe 
        return 0;

    }



    public int startPostEnroll(IBinder token) {

        IFingerprintDaemon daemon = getFingerprintDaemon();

        if (daemon == null) {

            Slog.w(TAG, "startPostEnroll: no fingeprintd!");

            return 0;

        }

        try {

            return daemon.postEnroll();

        } catch (RemoteException e) {

            Slog.e(TAG, "startPostEnroll failed", e);

        }

        return 0;

    }



    private void stopPendingOperations() {

        if (mEnrollClient != null) {

            stopEnrollment(mEnrollClient.token, true);
@@ -634,6 +648,12 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe 
            return startPreEnroll(token);

        }



        @Override // Binder call

        public int postEnroll(IBinder token) {

            checkPermission(MANAGE_FINGERPRINT);

            return startPostEnroll(token);

        }



        @Override // Binder call

        public void enroll(final IBinder token, final byte[] cryptoToken, final int groupId,

                final IFingerprintServiceReceiver receiver, final int flags) {