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

Commit 17828faf authored by Kevin Chyn's avatar Kevin Chyn Committed by Android (Google) Code Review
Browse files

Merge "Remove unused setting"

parents 959a08ff 499ff8a5

core/java/android/provider/Settings.java

+0 −12
Original line number Diff line number Diff line
@@ -8349,16 +8349,6 @@ public final class Settings { 
        private static final Validator FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION_VALIDATOR =

                BOOLEAN_VALIDATOR;













        /**













         * Whether or not the face unlock education screen has been shown to the user.













         * @hide













         */













        public static final String FACE_UNLOCK_EDUCATION_INFO_DISPLAYED =













                "face_unlock_education_info_displayed";

























        private static final Validator FACE_UNLOCK_EDUCATION_INFO_DISPLAYED_VALIDATOR =













                BOOLEAN_VALIDATOR;



























        /**















         * Whether or not debugging is enabled.















         * @hide










@@ -9182,8 +9172,6 @@ public final class Settings {













            VALIDATORS.put(FACE_UNLOCK_APP_ENABLED, FACE_UNLOCK_APP_ENABLED_VALIDATOR);















            VALIDATORS.put(FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION,















                    FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION_VALIDATOR);













            VALIDATORS.put(FACE_UNLOCK_EDUCATION_INFO_DISPLAYED,













                    FACE_UNLOCK_EDUCATION_INFO_DISPLAYED_VALIDATOR);















            VALIDATORS.put(ASSIST_GESTURE_ENABLED, ASSIST_GESTURE_ENABLED_VALIDATOR);















            VALIDATORS.put(ASSIST_GESTURE_SILENCE_ALERTS_ENABLED,















                    ASSIST_GESTURE_SILENCE_ALERTS_ENABLED_VALIDATOR);

































core/tests/coretests/src/android/provider/SettingsBackupTest.java



+0
−1




























Original line number
Diff line number
Diff line








@@ -720,7 +720,6 @@ public class SettingsBackupTest {













                 Settings.Secure.BIOMETRIC_DEBUG_ENABLED,















                 Settings.Secure.FACE_UNLOCK_ATTENTION_REQUIRED,















                 Settings.Secure.FACE_UNLOCK_DIVERSITY_REQUIRED,













                 Settings.Secure.FACE_UNLOCK_EDUCATION_INFO_DISPLAYED,















                 Settings.Secure.MANAGED_PROVISIONING_DPC_DOWNLOADED);































    @Test