Add IRestoreSession interface for the restore flow

Restore is a fairly complicated, somewhat stateful process, so we introduce
a new interface to encapsulate the various bits and pieces into a nicely
separable component.  In particular, this will make it much cleaner to
open and interrogate an expensive-to-construct transport and then reuse it
for the actual restore process itself.

3 files changed, 4 insertions, 4 deletions

diff --git a/core/java/com/android/internal/backup/AdbTransport.java b/core/java/com/android/internal/backup/AdbTransport.java
index db98062..46f0ed1 100644
--- a/core/java/com/android/internal/backup/AdbTransport.java
+++ b/core/java/com/android/internal/backup/AdbTransport.java
@@ -30,7 +30,7 @@ public class AdbTransport extends IBackupTransport.Stub {
     }
 
     // Restore handling
-    public Bundle getAvailableBackups() throws android.os.RemoteException {
+    public Bundle getAvailableRestoreSets() throws android.os.RemoteException {
         // !!! TODO: real implementation
         Bundle b = new Bundle();
         b.putIntArray("tokens", new int[0]);
diff --git a/core/java/com/android/internal/backup/GoogleTransport.java b/core/java/com/android/internal/backup/GoogleTransport.java
index 124677e..c20a957 100644
--- a/core/java/com/android/internal/backup/GoogleTransport.java
+++ b/core/java/com/android/internal/backup/GoogleTransport.java
@@ -28,7 +28,7 @@ public class GoogleTransport extends IBackupTransport.Stub {
     }
 
     // Restore handling
-    public Bundle getAvailableBackups() throws android.os.RemoteException {
+    public Bundle getAvailableRestoreSets() throws android.os.RemoteException {
         // !!! TODO: real implementation
         Bundle b = new Bundle();
         b.putIntArray("tokens", new int[0]);
diff --git a/core/java/com/android/internal/backup/IBackupTransport.aidl b/core/java/com/android/internal/backup/IBackupTransport.aidl
index 63c1bd4..1d59175 100644
--- a/core/java/com/android/internal/backup/IBackupTransport.aidl
+++ b/core/java/com/android/internal/backup/IBackupTransport.aidl
@@ -64,12 +64,12 @@ interface IBackupTransport {
     /**
      * Get the set of backups currently available over this transport.
      *
-     * @return backups A bundle containing two elements:  an int array under the key
+     * @return A bundle containing two elements:  an int array under the key
      *   "tokens" whose entries are a transport-private identifier for each backup set;
      *   and a String array under the key "names" whose entries are the user-meaningful
      *   names corresponding to the backup sets at each index in the tokens array.
      **/
-    Bundle getAvailableBackups();
+    Bundle getAvailableRestoreSets();
 
     /**
      * Get the set of applications from a given backup image.