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

Commit 0295c273 authored by Curtis Belmonte's avatar Curtis Belmonte Committed by Android (Google) Code Review
Browse files

Merge "Require non-null HAT for fingerprint enrollment" into sc-dev

parents bf09a9fa 592bacb7

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

+3 −3
Original line number Diff line number Diff line
@@ -215,9 +215,9 @@ public class FingerprintService extends SystemService { 
        }



        @Override // Binder call

        public void enroll(final IBinder token, final byte[] hardwareAuthToken, final int userId,

                final IFingerprintServiceReceiver receiver, final String opPackageName,

                @FingerprintManager.EnrollReason int enrollReason) {

        public void enroll(final IBinder token, @NonNull final byte[] hardwareAuthToken,

                final int userId, final IFingerprintServiceReceiver receiver,

                final String opPackageName, @FingerprintManager.EnrollReason int enrollReason) {

            Utils.checkPermission(getContext(), MANAGE_FINGERPRINT);



            final Pair<Integer, ServiceProvider> provider = getSingleProvider();

services/core/java/com/android/server/biometrics/sensors/fingerprint/ServiceProvider.java

+6 −3
Original line number Diff line number Diff line
@@ -85,9 +85,12 @@ public interface ServiceProvider { 
    void scheduleRevokeChallenge(int sensorId, int userId, @NonNull IBinder token,

            @NonNull String opPackageName, long challenge);



    void scheduleEnroll(int sensorId, @NonNull IBinder token, byte[] hardwareAuthToken, int userId,

            @NonNull IFingerprintServiceReceiver receiver, @NonNull String opPackageName,

            @FingerprintManager.EnrollReason int enrollReason,

    /**

     * Schedules fingerprint enrollment.

     */

    void scheduleEnroll(int sensorId, @NonNull IBinder token, @NonNull byte[] hardwareAuthToken,

            int userId, @NonNull IFingerprintServiceReceiver receiver,

            @NonNull String opPackageName, @FingerprintManager.EnrollReason int enrollReason,

            @NonNull FingerprintStateCallback fingerprintStateCallback);



    void cancelEnrollment(int sensorId, @NonNull IBinder token);

services/core/java/com/android/server/biometrics/sensors/fingerprint/aidl/FingerprintProvider.java

+4 −3
Original line number Diff line number Diff line
@@ -329,9 +329,10 @@ public class FingerprintProvider implements IBinder.DeathRecipient, ServiceProvi 
    }



    @Override

    public void scheduleEnroll(int sensorId, @NonNull IBinder token, byte[] hardwareAuthToken,

            int userId, @NonNull IFingerprintServiceReceiver receiver,

            @NonNull String opPackageName, @FingerprintManager.EnrollReason int enrollReason,

    public void scheduleEnroll(int sensorId, @NonNull IBinder token,

            @NonNull byte[] hardwareAuthToken, int userId,

            @NonNull IFingerprintServiceReceiver receiver, @NonNull String opPackageName,

            @FingerprintManager.EnrollReason int enrollReason,

            @NonNull FingerprintStateCallback fingerprintStateCallback) {

        mHandler.post(() -> {

            final int maxTemplatesPerUser = mSensors.get(sensorId).getSensorProperties()

services/core/java/com/android/server/locksettings/LockSettingsService.java

+2 −0
Original line number Diff line number Diff line
@@ -2174,6 +2174,7 @@ public class LockSettingsService extends ILockSettings.Stub { 
    @Override

    public VerifyCredentialResponse verifyGatekeeperPasswordHandle(long gatekeeperPasswordHandle,

            long challenge, int userId) {



        checkPasswordReadPermission();



        final VerifyCredentialResponse response;
@@ -2185,6 +2186,7 @@ public class LockSettingsService extends ILockSettings.Stub { 


        synchronized (mSpManager) {

            if (gatekeeperPassword == null) {

                Slog.d(TAG, "No gatekeeper password for handle");

                response = VerifyCredentialResponse.ERROR;

            } else {

                response = mSpManager.verifyChallengeInternal(getGateKeeperService(),