diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-06 18:24:26 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-06 18:24:26 -0700 |
| commit | dbee95cacff9d2faf30638e64abe26fbeb128787 (patch) | |
| tree | a9c7aa1fe367603b50e777ab65f0bb7371053353 /core/java/android | |
| parent | b71951591d72cddb4dbc3d39778dfcb5597a5733 (diff) | |
| parent | 8031a3df2fd0c38d85eeae39c1ea2c83e813f4ff (diff) | |
| download | frameworks_base-dbee95cacff9d2faf30638e64abe26fbeb128787.zip frameworks_base-dbee95cacff9d2faf30638e64abe26fbeb128787.tar.gz frameworks_base-dbee95cacff9d2faf30638e64abe26fbeb128787.tar.bz2 | |
Merge change 6317 into donut
* changes:
Make enable/provisioning of the backup service a two-step process
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/backup/IBackupManager.aidl | 7 | ||||
| -rw-r--r-- | core/java/android/provider/Settings.java | 9 |
2 files changed, 15 insertions, 1 deletions
diff --git a/core/java/android/backup/IBackupManager.aidl b/core/java/android/backup/IBackupManager.aidl index d4933ac..9d181be 100644 --- a/core/java/android/backup/IBackupManager.aidl +++ b/core/java/android/backup/IBackupManager.aidl @@ -73,6 +73,13 @@ interface IBackupManager { void setBackupEnabled(boolean isEnabled); /** + * Indicate that any necessary one-time provisioning has occurred. + * + * <p>Callers must hold the android.permission.BACKUP permission to use this method. + */ + void setBackupProvisioned(boolean isProvisioned); + + /** * Report whether the backup mechanism is currently enabled. * * <p>Callers must hold the android.permission.BACKUP permission to use this method. diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 7017333..7f63bff 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -2269,13 +2269,20 @@ public final class Settings { public static final String USE_LOCATION_FOR_SERVICES = "use_location"; /** - * Controls whether data backup is enabled. + * Controls whether settings backup is enabled. * Type: int ( 0 = disabled, 1 = enabled ) * @hide */ public static final String BACKUP_ENABLED = "backup_enabled"; /** + * Indicates whether settings backup has been fully provisioned. + * Type: int ( 0 = unprovisioned, 1 = fully provisioned ) + * @hide + */ + public static final String BACKUP_PROVISIONED = "backup_provisioned"; + + /** * Component of the transport to use for backup/restore. * @hide */ |