diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-01-15 03:50:25 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-01-15 03:50:25 +0000 |
| commit | b4e8c3267707bb745e76dfbc8a7cfe0cfa0d71ed (patch) | |
| tree | dcd3825d1a1a600dc46d49e0753d89cfc97bdc96 | |
| parent | 3f039f732eb913f95e2d1bdeb1b0c818ea819676 (diff) | |
| parent | 02bd0389e333117d41237911069f4cf914bc399b (diff) | |
Merge "Revert "Create setting key for emergency gesture call number override""
3 files changed, 0 insertions, 10 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 9db7ca0cad6b..9b570b7cdef9 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -8440,14 +8440,6 @@ public final class Settings { "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. * diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java index 53e67e153c74..fbc71f100b40 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java @@ -264,7 +264,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); diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index e22f2649d540..07a5a4455f27 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -742,7 +742,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, |