commit 8cfe3715fa53a63588b9dc3f95f3bcb114d368cb
author Curtis Belmonte <curtislb@google.com> Thu Sep 26 16:02:41 2019 -0700
committer Curtis Belmonte <curtislb@google.com> Thu Sep 26 16:20:32 2019 -0700
tree c7d0ee53f6d36cfe7c50af1005251b73e7364bf4
parent cfc621518c7a6863c66b5218c72adff9a50f0c48

Clear face re-enroll setting when all faces removed

Test: manual
Bug: 141254937
Change-Id: Ib6d23a39ac3d5a8251c3752d6d8b5e698a3069bb

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 ee49f58..387d7a8 100644
--- a/services/core/java/com/android/server/biometrics/face/FaceService.java
+++ b/services/core/java/com/android/server/biometrics/face/FaceService.java
@@ -53,6 +53,7 @@
 import android.os.SystemProperties;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.provider.Settings;
 import android.util.Slog;
 
 import com.android.internal.R;
@@ -926,7 +927,8 @@
                     final Face face = new Face("", 0 /* identifier */, deviceId);
                     FaceService.super.handleRemoved(face, 0 /* remaining */);
                 }
-
+                Settings.Secure.putIntForUser(getContext().getContentResolver(),
+                        Settings.Secure.FACE_UNLOCK_RE_ENROLL, 0, UserHandle.USER_CURRENT);
             });
         }