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

Commit 8e089728 authored by Fan Zhang's avatar Fan Zhang
Browse files

Create setting key for emergency gesture call number override 

This setting will store an emergency number locally if government
provided emergency number (such as 911, 110) are not desired by user,
used by emergency apps such as EmergencyInfo and Personal Safety on
Pixel.

Bug: 172609395
Test: manual/rebuild
Change-Id: I8732c20f0438e521eaec73758242015794c80c3b
parent bfdd1a33

core/java/android/provider/Settings.java

+8 −0
Original line number Diff line number Diff line
@@ -8411,6 +8411,14 @@ 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



+1
−0




























Original line number
Diff line number
Diff line








@@ -269,6 +269,7 @@ 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



+1
−0




























Original line number
Diff line number
Diff line








@@ -743,6 +743,7 @@ 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,