From 37adc270fdc7d2f839713669792c6feabed369c4 Mon Sep 17 00:00:00 2001 From: Annie Meng Date: Thu, 3 May 2018 11:21:25 +0100 Subject: [PATCH] Remove unused critical accessibility settings from backup/restore ACCESSIBILITY_SPEAK_PASSWORD was deprecated in O and is forced true with a default. UI_NIGHT_MODE was removed from being backed up since M. This is to clean up the critical accessibility settings check. Bug: 78227065 Test: 1) atest SettingsBackupTest 2) atest SettingsValidatorsTest 3) manual: d2d does not restore ACCESSIBILITY_SPEAK_PASSWORD or UI_NIGHT_MODE Change-Id: I50478fc8a476817301cce7187165a79b249ee31a --- core/java/android/provider/Settings.java | 4 ---- .../coretests/src/android/provider/SettingsBackupTest.java | 1 + .../src/com/android/providers/settings/SettingsHelper.java | 2 -- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index fe24fbba8a524..34db6a3e81fe8 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -6012,8 +6012,6 @@ public final class Settings { @Deprecated public static final String ACCESSIBILITY_SPEAK_PASSWORD = "speak_password"; - private static final Validator ACCESSIBILITY_SPEAK_PASSWORD_VALIDATOR = BOOLEAN_VALIDATOR; - /** * Whether to draw text with high contrast while in accessibility mode. * @@ -7907,7 +7905,6 @@ public final class Settings { ACCESSIBILITY_SHORTCUT_DIALOG_SHOWN, ACCESSIBILITY_SHORTCUT_ENABLED, ACCESSIBILITY_SHORTCUT_ON_LOCK_SCREEN, - ACCESSIBILITY_SPEAK_PASSWORD, ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED, ACCESSIBILITY_CAPTIONING_PRESET, ACCESSIBILITY_CAPTIONING_ENABLED, @@ -8021,7 +8018,6 @@ public final class Settings { ACCESSIBILITY_SHORTCUT_ENABLED_VALIDATOR); VALIDATORS.put(ACCESSIBILITY_SHORTCUT_ON_LOCK_SCREEN, ACCESSIBILITY_SHORTCUT_ON_LOCK_SCREEN_VALIDATOR); - VALIDATORS.put(ACCESSIBILITY_SPEAK_PASSWORD, ACCESSIBILITY_SPEAK_PASSWORD_VALIDATOR); VALIDATORS.put(ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED, ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED_VALIDATOR); VALIDATORS.put(ACCESSIBILITY_CAPTIONING_PRESET, diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java index cfc7f9faf2724..0d390e59610f3 100644 --- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java +++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java @@ -491,6 +491,7 @@ public class SettingsBackupTest { private static final Set BACKUP_BLACKLISTED_SECURE_SETTINGS = newHashSet( Settings.Secure.ACCESSIBILITY_SOFT_KEYBOARD_MODE, + Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD, // Deprecated since O. Settings.Secure.ALLOWED_GEOLOCATION_ORIGINS, Settings.Secure.ALWAYS_ON_VPN_APP, Settings.Secure.ALWAYS_ON_VPN_LOCKDOWN, diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java index 8de361105104f..8bab807480317 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java @@ -247,12 +247,10 @@ public class SettingsHelper { // these features working after the restore. switch (name) { case Settings.Secure.ACCESSIBILITY_ENABLED: - case Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD: case Settings.Secure.TOUCH_EXPLORATION_ENABLED: case Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED: case Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED: case Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_NAVBAR_ENABLED: - case Settings.Secure.UI_NIGHT_MODE: return Settings.Secure.getInt(mContext.getContentResolver(), name, 0) != 0; case Settings.Secure.TOUCH_EXPLORATION_GRANTED_ACCESSIBILITY_SERVICES: case Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES: