Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "face_slice_update-qt-qpr1-dev" into qt-qpr1-dev

Browse Source 
* changes:
  Clear face re-enroll setting when all faces removed
  Added secure setting for face re enrollment.
This commit is contained in:
Kevin Chyn
2019-09-27 02:53:34 +00:00
committed by Android (Google) Code Review
parent ad37297b2c 8cfe3715fa
commit b61c1bb3ee
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/provider/Settings.java
View File

@@ -8361,6 +8361,19 @@ public final class Settings {
private static final Validator FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION_VALIDATOR =
BOOLEAN_VALIDATOR;
/**
* Whether or not a user should re enroll their face.
*
* Face unlock re enroll.
* 0 = No re enrollment.
* 1 = Re enrollment is suggested.
* 2 = Re enrollment is required after a set time period.
* 3 = Re enrollment is required immediately.
*
* @hide
*/
public static final String FACE_UNLOCK_RE_ENROLL = "face_unlock_re_enroll";
/**
* Whether or not debugging is enabled.
* @hide

3
core/tests/coretests/src/android/provider/SettingsBackupTest.java
View File

@@ -722,7 +722,8 @@ public class SettingsBackupTest {
Settings.Secure.LOCATION_ACCESS_CHECK_DELAY_MILLIS,
Settings.Secure.BIOMETRIC_DEBUG_ENABLED,
Settings.Secure.FACE_UNLOCK_ATTENTION_REQUIRED,
Settings.Secure.FACE_UNLOCK_DIVERSITY_REQUIRED);
Settings.Secure.FACE_UNLOCK_DIVERSITY_REQUIRED,
Settings.Secure.FACE_UNLOCK_RE_ENROLL);
@Test
public void systemSettingsBackedUpOrBlacklisted() {

4
services/core/java/com/android/server/biometrics/face/FaceService.java
View File

@@ -53,6 +53,7 @@ import android.os.SELinux;
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 @@ public class FaceService extends BiometricServiceBase {
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);
});
}