summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorChristopher Tate <ctate@google.com>2013-11-18 18:48:29 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-18 18:48:29 -0800
commitfa331b1dfbf3e071e2ff48dbe21727452bfb8042 (patch)
treeb6ce04ec9b728796470ea82de2c83029a2fddb59 /core/java/android
parent27927d5d55eb4bd9087bdeba7df1e98f280177bd (diff)
parent1e964ed808798a56664853e2aeffdc47c676ac5a (diff)
am 1e964ed8: am d6bbc544: Merge "Harden against transiently unavailable backup transports" into klp-dev
* commit '1e964ed808798a56664853e2aeffdc47c676ac5a': Harden against transiently unavailable backup transports
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/app/backup/IBackupManager.aidl4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/app/backup/IBackupManager.aidl b/core/java/android/app/backup/IBackupManager.aidl
index bb4f5f160bbe..12ee3b624f63 100644
--- a/core/java/android/app/backup/IBackupManager.aidl
+++ b/core/java/android/app/backup/IBackupManager.aidl
@@ -43,14 +43,14 @@ interface IBackupManager {
void dataChanged(String packageName);
/**
- * Erase all backed-up data for the given package from the storage
+ * Erase all backed-up data for the given package from the given storage
* destination.
*
* Any application can invoke this method for its own package, but
* only callers who hold the android.permission.BACKUP permission
* may invoke it for arbitrary packages.
*/
- void clearBackupData(String packageName);
+ void clearBackupData(String transportName, String packageName);
/**
* Notifies the Backup Manager Service that an agent has become available. This