commit 1d6a286794bb99b1939c87fd83a4414ef5143f42
author Kevin Chyn <kchyn@google.com> Tue Apr 02 16:20:21 2019 -0700
committer Kevin Chyn <kchyn@google.com> Tue Apr 02 16:27:11 2019 -0700
tree cef1a833040e048c51f40f1ef13bf6f1061a034c
parent d6ecaf064c70ae0c687251cbf52dfea4437b4011

Don't invoke resetLockout when not enrolled

Fixes: 129559946

Test: lockout reset still works
Change-Id: I568429f729c75131baa8056ec559a7d5397ead71

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

diff --git a/services/core/java/com/android/server/biometrics/face/FaceService.java b/services/core/java/com/android/server/biometrics/face/FaceService.java
index fe762c0..5e4bf33 100644
--- a/services/core/java/com/android/server/biometrics/face/FaceService.java
+++ b/services/core/java/com/android/server/biometrics/face/FaceService.java
@@ -46,9 +46,9 @@
 import android.os.SELinux;
 import android.os.UserHandle;
 import android.os.UserManager;
-import android.service.restricted_image.RestrictedImagesDumpProto;
 import android.service.restricted_image.RestrictedImageProto;
 import android.service.restricted_image.RestrictedImageSetProto;
+import android.service.restricted_image.RestrictedImagesDumpProto;
 import android.util.Slog;
 import android.util.proto.ProtoOutputStream;
 
@@ -383,6 +383,12 @@
         @Override // Binder call
         public void resetLockout(byte[] token) {
             checkPermission(MANAGE_BIOMETRIC);
+
+            if (!FaceService.this.hasEnrolledBiometrics(mCurrentUserId)) {
+                Slog.w(TAG, "Ignoring lockout reset, no templates enrolled");
+                return;
+            }
+
             try {
                 mDaemonWrapper.resetLockout(token);
             } catch (RemoteException e) {