diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2011-09-21 19:08:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-09-21 19:08:28 -0700 |
| commit | df8e00ff335be747ec3b99038734d2c6bec6499f (patch) | |
| tree | 616e8972d2cf3f97fa7db4f72109899d39fc3ee8 /core/java/android | |
| parent | a0c7ec2b5a6940c504ea5af0db46ebc0ec091155 (diff) | |
| parent | 624181af38f7f9e4fe4a18ca3e15204f30609312 (diff) | |
| download | frameworks_base-df8e00ff335be747ec3b99038734d2c6bec6499f.zip frameworks_base-df8e00ff335be747ec3b99038734d2c6bec6499f.tar.gz frameworks_base-df8e00ff335be747ec3b99038734d2c6bec6499f.tar.bz2 | |
am 624181af: Merge "Settings are restored in alphabetical order rather in order of dependency." into ics-factoryrom
* commit '624181af38f7f9e4fe4a18ca3e15204f30609312':
Settings are restored in alphabetical order rather in order of dependency.
Diffstat (limited to 'core/java/android')
| -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, |