diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2011-09-20 18:32:20 -0700 |
|---|---|---|
| committer | Svetoslav Ganov <svetoslavganov@google.com> | 2011-09-21 18:21:24 -0700 |
| commit | a571a5836cdbc71feefb13648004b8ca7fe05dfb (patch) | |
| tree | 227a0e4a7b8dd168bb35aad9ebe75b107006b70f /core/java | |
| parent | aff24a52d20a26a8cd374ea6dd284eee16e4ffc0 (diff) | |
| download | frameworks_base-a571a5836cdbc71feefb13648004b8ca7fe05dfb.zip frameworks_base-a571a5836cdbc71feefb13648004b8ca7fe05dfb.tar.gz frameworks_base-a571a5836cdbc71feefb13648004b8ca7fe05dfb.tar.bz2 | |
Settings are restored in alphabetical order rather in order of dependency.
Settings were restore in alphabetical order and capturing dependency
among them required keys to be chosen in such a way that after sorting
they apprear in dependency order. Now settings are exported and restored
in the order they are declared in the arrays of settings to backup.
Hence, the order in this array will capture the dependency order.
bug:5343351
Change-Id: I93a40bcdd194943cd6f85aa18f1557d546e38274
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/provider/Settings.java | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index bc5994e..bc05078 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -1882,6 +1882,11 @@ public final class Settings { /** * Settings to backup. This is here so that it's in the same place as the settings * keys and easy to update. + * + * NOTE: Settings are backed up and restored in the order they appear + * in this array. If you have one setting depending on another, + * make sure that they are ordered appropriately. + * * @hide */ public static final String[] SETTINGS_TO_BACKUP = { @@ -4048,6 +4053,12 @@ public final class Settings { public static final String PACKAGE_VERIFIER_TIMEOUT = "verifier_timeout"; /** + * This are the settings to be backed up. + * + * NOTE: Settings are backed up and restored in the order they appear + * in this array. If you have one setting depending on another, + * make sure that they are ordered appropriately. + * * @hide */ public static final String[] SETTINGS_TO_BACKUP = { @@ -4056,11 +4067,11 @@ public final class Settings { PARENTAL_CONTROL_ENABLED, PARENTAL_CONTROL_REDIRECT_URL, USB_MASS_STORAGE_ENABLED, - ACCESSIBILITY_ENABLED, ACCESSIBILITY_SCRIPT_INJECTION, BACKUP_AUTO_RESTORE, ENABLED_ACCESSIBILITY_SERVICES, TOUCH_EXPLORATION_ENABLED, + ACCESSIBILITY_ENABLED, TTS_USE_DEFAULTS, TTS_DEFAULT_RATE, TTS_DEFAULT_PITCH, |