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

Fix SharedPrefsBackupHelper so it doesn't hard code the paths to the files.

Browse Source 
This took quite a bit of refactoring.
This commit is contained in:
Joe Onorato
2009-06-10 17:07:15 -07:00
parent 0b77453076
commit 23ecae3bbb
12 changed files with 236 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
core/java/android/backup/FileBackupHelper.java
View File

@@ -20,6 +20,7 @@ import android.content.Context;
import android.os.ParcelFileDescriptor;
import android.util.Log;
import java.io.File;
import java.io.FileDescriptor;
/** @hide */
@@ -34,22 +35,34 @@ public class FileBackupHelper {
public static void performBackup(Context context,
ParcelFileDescriptor oldState, BackupDataOutput data,
ParcelFileDescriptor newState, String[] files) {
String basePath = context.getFilesDir().getAbsolutePath();
performBackup_checked(basePath, oldState, data, newState, files);
File base = context.getFilesDir();
final int N = files.length;
String[] fullPaths = new String[N];
for (int i=0; i<N; i++) {
fullPaths[i] = (new File(base, files[i])).getAbsolutePath();
}
performBackup_checked(oldState, data, newState, fullPaths, files);
}
/**
* Check the parameters so the native code doens't have to throw all the exceptions
* since it's easier to do that from java.
*/
static void performBackup_checked(String basePath,
ParcelFileDescriptor oldState, BackupDataOutput data,
ParcelFileDescriptor newState, String[] files) {
static void performBackup_checked(ParcelFileDescriptor oldState, BackupDataOutput data,
ParcelFileDescriptor newState, String[] files, String[] keys) {
if (files.length == 0) {
return;
}
if (basePath == null) {
throw new NullPointerException();
// files must be all absolute paths
for (String f: files) {
if (f.charAt(0) != '/') {
throw new RuntimeException("files must have all absolute paths: " + f);
}
}
// the length of files and keys must be the same
if (files.length != keys.length) {
throw new RuntimeException("files.length=" + files.length
+ " keys.length=" + keys.length);
}
// oldStateFd can be null
FileDescriptor oldStateFd = oldState != null ? oldState.getFileDescriptor() : null;
@@ -58,13 +71,14 @@ public class FileBackupHelper {
throw new NullPointerException();
}
int err = performBackup_native(basePath, oldStateFd, data.mBackupWriter, newStateFd, files);
int err = performBackup_native(oldStateFd, data.mBackupWriter, newStateFd, files, keys);
if (err != 0) {
throw new RuntimeException("Backup failed"); // TODO: more here
// TODO: more here
throw new RuntimeException("Backup failed 0x" + Integer.toHexString(err));
}
}
native private static int performBackup_native(String basePath, FileDescriptor oldState,
int data, FileDescriptor newState, String[] files);
native private static int performBackup_native(FileDescriptor oldState,
int data, FileDescriptor newState, String[] files, String[] keys);
}

6
core/java/android/backup/SharedPreferencesBackupHelper.java
View File

@@ -26,16 +26,14 @@ public class SharedPreferencesBackupHelper {
public static void performBackup(Context context,
ParcelFileDescriptor oldSnapshot, ParcelFileDescriptor newSnapshot,
BackupDataOutput data, String[] prefGroups) {
String basePath = "/xxx"; //context.getPreferencesDir();
// make filenames for the prefGroups
final int N = prefGroups.length;
String[] files = new String[N];
for (int i=0; i<N; i++) {
files[i] = prefGroups[i] + ".xml";
files[i] = context.getSharedPrefsFile(prefGroups[i]).toString();
}
FileBackupHelper.performBackup_checked(basePath, oldSnapshot, data, newSnapshot, files);
FileBackupHelper.performBackup_checked(oldSnapshot, data, newSnapshot, files, prefGroups);
}
}