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

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

Merge changes from topics "face-hidl-2", "face-hidl-1" 

* changes:
  2/2: Update framework together with HIDL
  1/2: Update framework together with HIDL
parents 18df2276 96c92978

services/core/java/com/android/server/biometrics/face/FaceService.java

+4 −3
Original line number Diff line number Diff line
@@ -574,7 +574,8 @@ public class FaceService extends BiometricService { 
            for (int i = 0; i < cryptoToken.length; i++) {

                token.add(cryptoToken[i]);

            }

            return daemon.enroll(token, timeout);

            // TODO: plumb requireAttention down from framework

            return daemon.enroll(token, timeout, true /* requireAttention */);

        }

    };
@@ -757,7 +758,7 @@ public class FaceService extends BiometricService { 
            return 0;

        }

        try {

            return daemon.preEnroll().value;

            return daemon.generateChallenge().value;

        } catch (RemoteException e) {

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

        }
@@ -771,7 +772,7 @@ public class FaceService extends BiometricService { 
            return 0;

        }

        try {

            return daemon.postEnroll();

            return daemon.revokeChallenge();

        } catch (RemoteException e) {

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

        }