Merge change 4287 into donut

* changes:
  Sketch out a 'bmgr' command line tool

1 files changed, 14 insertions, 2 deletions

diff --git a/core/java/android/backup/IBackupManager.aidl b/core/java/android/backup/IBackupManager.aidl
index 1054642..efc664c 100644
--- a/core/java/android/backup/IBackupManager.aidl
+++ b/core/java/android/backup/IBackupManager.aidl
@@ -48,10 +48,22 @@ interface IBackupManager {
     oneway void agentDisconnected(String packageName);
 
     /**
-     * Schedule a full backup of the given package.  Callers must hold the
+     * Schedule an immediate backup attempt for all pending updates.  This is
+     * primarily intended for transports to use when they detect a suitable
+     * opportunity for doing a backup pass.  If there are no pending updates to
+     * be sent, no action will be taken.  Even if some updates are pending, the
+     * transport will still be asked to confirm via the usual requestBackupTime()
+     * method.
+     *
+     * <p>Callers must hold the android.permission.BACKUP permission to use this method.
+     */
+    oneway void backupNow();
+
+    /**
+     * Identify the currently selected transport.  Callers must hold the
      * android.permission.BACKUP permission to use this method.
      */
-    oneway void scheduleFullBackup(String packageName);
+    int getCurrentTransport();
 
     /**
      * Specify a default backup transport.  Callers must hold the