diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-07-03 08:55:59 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-07-03 08:55:59 -0700 |
| commit | 575d1af980f4b4866325bfc487455f54606cf49e (patch) | |
| tree | 0e342963e3e06a2193f07519d440a840d0e2df3e /core | |
| parent | 7a91dc11ac3edd101fc06ebbc89cca76314fc538 (diff) | |
| parent | cf098294da7a820d5c30d8ed2006ed5446ee1da9 (diff) | |
| download | frameworks_base-575d1af980f4b4866325bfc487455f54606cf49e.zip frameworks_base-575d1af980f4b4866325bfc487455f54606cf49e.tar.gz frameworks_base-575d1af980f4b4866325bfc487455f54606cf49e.tar.bz2 | |
resolved conflicts for merge of cf098294 to master
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/provider/Settings.java | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 6f0d056..57d4c44 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -2248,6 +2248,19 @@ public final class Settings { public static final String USE_LOCATION_FOR_SERVICES = "use_location"; /** + * Controls whether data backup is enabled. + * Type: int ( 0 = disabled, 1 = enabled ) + * @hide + */ + public static final String BACKUP_ENABLED = "backup_enabled"; + + /** + * Component of the transport to use for backup/restore. + * @hide + */ + public static final String BACKUP_TRANSPORT = "backup_transport"; + + /** * Helper method for determining if a location provider is enabled. * @param cr the content resolver to use * @param provider the location provider to query |