summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorChristopher Tate <ctate@google.com>2013-11-18 18:51:51 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-18 18:51:51 -0800
commitf3f31142c68b9bd178bd638c010e4dade8ffd19d (patch)
tree6db460fa4990fb9114fafa26f59aa26c7dcc3e68 /core/java/android
parentc178141afa429d344ae4ca08d2e2d6bbd3f6bf02 (diff)
parentfa331b1dfbf3e071e2ff48dbe21727452bfb8042 (diff)
am fa331b1d: am 1e964ed8: am d6bbc544: Merge "Harden against transiently unavailable backup transports" into klp-dev
* commit 'fa331b1dfbf3e071e2ff48dbe21727452bfb8042': 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