diff options
| author | Christopher Tate <ctate@google.com> | 2015-01-07 23:30:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-07 23:30:34 +0000 |
| commit | e04518866e0c75e6c96976aca77f24dc22b51416 (patch) | |
| tree | af28f96c9582adb098bc98b135f64ab0fb539131 /core/java/android/app/backup | |
| parent | 555ea653bae019379eb8d1aa70dfcb86789c19d3 (diff) | |
| parent | 413ec4a6573ffa88bf02a796eb8c9dc7dfa839ca (diff) | |
| download | frameworks_base-e04518866e0c75e6c96976aca77f24dc22b51416.zip frameworks_base-e04518866e0c75e6c96976aca77f24dc22b51416.tar.gz frameworks_base-e04518866e0c75e6c96976aca77f24dc22b51416.tar.bz2 | |
am 413ec4a6: am bee49807: Merge "Support single-package backup rejection by the transport" into lmp-mr1-dev
* commit '413ec4a6573ffa88bf02a796eb8c9dc7dfa839ca':
Support single-package backup rejection by the transport
Diffstat (limited to 'core/java/android/app/backup')
| -rw-r--r-- | core/java/android/app/backup/BackupTransport.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/core/java/android/app/backup/BackupTransport.java b/core/java/android/app/backup/BackupTransport.java index 70bb5e4..e853540 100644 --- a/core/java/android/app/backup/BackupTransport.java +++ b/core/java/android/app/backup/BackupTransport.java @@ -213,8 +213,9 @@ public class BackupTransport { /** * Send one application's key/value data update to the backup destination. The - * transport may send the data immediately, or may buffer it. After this is called, - * {@link #finishBackup} will be called to ensure the data is sent and recorded successfully. + * transport may send the data immediately, or may buffer it. If this method returns + * {@link #TRANSPORT_OK}, {@link #finishBackup} will then be called to ensure the data + * is sent and recorded successfully. * * @param packageInfo The identity of the application whose data is being backed up. * This specifically includes the signature list for the package. @@ -226,6 +227,8 @@ public class BackupTransport { * is to provide a guarantee that no stale data exists in the restore set when the * device begins providing incremental backups. * @return one of {@link BackupTransport#TRANSPORT_OK} (OK so far), + * {@link BackupTransport#TRANSPORT_PACKAGE_REJECTED} (to suppress backup of this + * specific package, but allow others to proceed), * {@link BackupTransport#TRANSPORT_ERROR} (on network error or other failure), or * {@link BackupTransport#TRANSPORT_NOT_INITIALIZED} (if the backend dataset has * become lost due to inactivity purge or some other reason and needs re-initializing) |