resolve merge conflicts of 2c712acefa935baa4f5b1dc0d321957add70e9c1 to master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ie50a4cf9233732646ef340dbce54f5f51bda64cd
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 61d8eb1..3c26df3 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -7631,6 +7631,19 @@
"face_unlock_always_require_confirmation";
/**
+ * 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
*/
diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
index 3a7de18..86625fa 100644
--- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
+++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
@@ -719,7 +719,8 @@
Settings.Secure.BIOMETRIC_DEBUG_ENABLED,
Settings.Secure.FACE_UNLOCK_ATTENTION_REQUIRED,
Settings.Secure.FACE_UNLOCK_DIVERSITY_REQUIRED,
- Settings.Secure.MANAGED_PROVISIONING_DPC_DOWNLOADED);
+ Settings.Secure.MANAGED_PROVISIONING_DPC_DOWNLOADED,
+ Settings.Secure.FACE_UNLOCK_RE_ENROLL);
@Test
public void systemSettingsBackedUpOrBlacklisted() {