Make RestoreHelper and friends also write out the snapshot state.

2 files changed, 7 insertions, 2 deletions

diff --git a/tests/backup/src/com/android/backuptest/BackupTestActivity.java b/tests/backup/src/com/android/backuptest/BackupTestActivity.java
index d87e85c..f0c3f93 100644
--- a/tests/backup/src/com/android/backuptest/BackupTestActivity.java
+++ b/tests/backup/src/com/android/backuptest/BackupTestActivity.java
@@ -161,8 +161,13 @@ public class BackupTestActivity extends ListActivity
                             new FileRestoreHelper(BackupTestActivity.this));
                     FileInputStream dataFile = openFileInput("backup_test");
                     BackupDataInput data = new BackupDataInput(dataFile.getFD());
-                    dispatch.dispatch(data);
+                    ParcelFileDescriptor state = ParcelFileDescriptor.open(
+                            new File(getFilesDir(), "restore_state"),
+                            ParcelFileDescriptor.MODE_READ_WRITE|ParcelFileDescriptor.MODE_CREATE|
+                            ParcelFileDescriptor.MODE_TRUNCATE);
+                    dispatch.dispatch(data, state);
                     dataFile.close();
+                    state.close();
                 } catch (IOException ex) {
                     throw new RuntimeException(ex);
                 }
diff --git a/tests/backup/src/com/android/backuptest/BackupTestAgent.java b/tests/backup/src/com/android/backuptest/BackupTestAgent.java
index e3566ec..0da4151 100644
--- a/tests/backup/src/com/android/backuptest/BackupTestAgent.java
+++ b/tests/backup/src/com/android/backuptest/BackupTestAgent.java
@@ -55,7 +55,7 @@ public class BackupTestAgent extends BackupAgent
         // dispatch.addHelper(SHARED_PREFS, new SharedPrefsRestoreHelper(this));
         dispatch.addHelper(DATA_FILES, new FileRestoreHelper(this));
 
-        dispatch.dispatch(data);
+        dispatch.dispatch(data, newState);
     }
 }