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

Commit de57cea3 authored by Kevin Chyn's avatar Kevin Chyn
Browse files

resolve merge conflicts of 2c712ace to master 

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ie50a4cf9233732646ef340dbce54f5f51bda64cd
parents 1b1480d0 2c712ace

core/java/android/provider/Settings.java

+13 −0
Original line number Original line Diff line number Diff line
@@ -7630,6 +7630,19 @@ public final class Settings { 
        public static final String FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION =

        public static final String FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION =

                "face_unlock_always_require_confirmation";

                "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.







         * Whether or not debugging is enabled.











         * @hide







         * @hide

































packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java



+2
−1




























Original line number
Original line
Diff line number
Diff line








@@ -719,7 +719,8 @@ public class SettingsBackupTest {









                 Settings.Secure.BIOMETRIC_DEBUG_ENABLED,







                 Settings.Secure.BIOMETRIC_DEBUG_ENABLED,











                 Settings.Secure.FACE_UNLOCK_ATTENTION_REQUIRED,







                 Settings.Secure.FACE_UNLOCK_ATTENTION_REQUIRED,











                 Settings.Secure.FACE_UNLOCK_DIVERSITY_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







    @Test











    public void systemSettingsBackedUpOrBlacklisted() {







    public void systemSettingsBackedUpOrBlacklisted() {