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

Commit 02bd0389 authored by Fan Zhang's avatar Fan Zhang
Browse files

Revert "Create setting key for emergency gesture call number override" 

This reverts commit 8e089728.

Reason for revert: It turns out we don't need this feature

Change-Id: Ibc042e451d66a1b87ed416bed41461df52f70a66
parent 8e089728

core/java/android/provider/Settings.java

+0 −8
Original line number Diff line number Diff line
@@ -8411,14 +8411,6 @@ public final class Settings { 
        public static final String EMERGENCY_GESTURE_SOUND_ENABLED =

                "emergency_gesture_sound_enabled";













        /**













         * The default number to call in emergency gesture













         *













         * @hide













         */













        public static final String EMERGENCY_GESTURE_CALL_NUMBER =













                "emergency_gesture_call_number";



























        /**















         * Whether the camera launch gesture to double tap the power button when the screen is off















         * should be disabled.

































packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java



+0
−1




























Original line number
Diff line number
Diff line








@@ -269,7 +269,6 @@ public class SecureSettingsValidators {













        VALIDATORS.put(Secure.SWIPE_BOTTOM_TO_NOTIFICATION_ENABLED, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Secure.EMERGENCY_GESTURE_ENABLED, BOOLEAN_VALIDATOR);















        VALIDATORS.put(Secure.EMERGENCY_GESTURE_SOUND_ENABLED, BOOLEAN_VALIDATOR);













        VALIDATORS.put(Secure.EMERGENCY_GESTURE_CALL_NUMBER, NONE_NEGATIVE_LONG_VALIDATOR);















        VALIDATORS.put(Secure.ADAPTIVE_CONNECTIVITY_ENABLED, BOOLEAN_VALIDATOR);















        VALIDATORS.put(















                Secure.ASSIST_HANDLES_LEARNING_TIME_ELAPSED_MILLIS, NONE_NEGATIVE_LONG_VALIDATOR);

































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



+0
−1




























Original line number
Diff line number
Diff line








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













                 Settings.Secure.SKIP_GESTURE,















                 Settings.Secure.SILENCE_GESTURE,















                 Settings.Secure.DOZE_WAKE_LOCK_SCREEN_GESTURE,













                 Settings.Secure.EMERGENCY_GESTURE_CALL_NUMBER,















                 Settings.Secure.DOZE_WAKE_DISPLAY_GESTURE,















                 Settings.Secure.FACE_UNLOCK_RE_ENROLL,















                 Settings.Secure.TAP_GESTURE,