Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bring the test transport's restore code into line

Browse Source 
It now reconstructs the backup data stream as it was originally structured, no
longer assuming that its backed-up records can simply be concatenated into the
destination stream.
This commit is contained in:
Christopher Tate
2009-06-15 12:31:20 -07:00
parent 2c723ee0cc
commit 8e55eac96d
1 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
core/java/com/android/internal/backup/LocalTransport.java
View File

@@ -1,6 +1,7 @@
package com.android.internal.backup; package com.android.internal.backup;
import android.backup.BackupDataInput; import android.backup.BackupDataInput;
import android.backup.BackupDataOutput;
import android.backup.RestoreSet; import android.backup.RestoreSet;
import android.content.Context; import android.content.Context;
import android.content.pm.PackageInfo; import android.content.pm.PackageInfo;
@@ -147,7 +148,7 @@ public class LocalTransport extends IBackupTransport.Stub {
return packages.toArray(result); return packages.toArray(result);
} }
public int getRestoreData(int token, PackageInfo packageInfo, ParcelFileDescriptor output) public int getRestoreData(int token, PackageInfo packageInfo, ParcelFileDescriptor outFd)
throws android.os.RemoteException { throws android.os.RemoteException {
if (DEBUG) Log.v(TAG, "getting restore data " + token + " : " + packageInfo.packageName); if (DEBUG) Log.v(TAG, "getting restore data " + token + " : " + packageInfo.packageName);
// we only support one hardcoded restore set // we only support one hardcoded restore set
@@ -161,28 +162,21 @@ public class LocalTransport extends IBackupTransport.Stub {
File[] blobs = packageDir.listFiles(); File[] blobs = packageDir.listFiles();
int err = 0; int err = 0;
if (blobs != null && blobs.length > 0) { if (blobs != null && blobs.length > 0) {
for (File f : blobs) { BackupDataOutput out = new BackupDataOutput(mContext, outFd.getFileDescriptor());
err = copyFileToFD(f, output); try {
if (err != 0) break; for (File f : blobs) {
FileInputStream in = new FileInputStream(f);
int size = (int) f.length();
byte[] buf = new byte[size];
in.read(buf);
out.writeEntityHeader(f.getName(), size);
out.writeEntityData(buf, size);
}
} catch (Exception e) {
Log.e(TAG, "Unable to read backup records");
err = -1;
} }
} }
return err; return err;
} }
private int copyFileToFD(File source, ParcelFileDescriptor dest) {
try {
FileInputStream in = new FileInputStream(source);
FileOutputStream out = new FileOutputStream(dest.getFileDescriptor());
byte[] buffer = new byte[4096];
int bytesRead;
while ((bytesRead = in.read(buffer)) >= 0) {
out.write(buffer, 0, bytesRead);
}
} catch (IOException e) {
// something went wrong; claim failure
return -1;
}
return 0;
}
} }