commit d2110dbce071a236b6176de344ca797b737542eb
author Joe Onorato <joeo@android.com> Tue May 19 13:41:21 2009 -0700
committer Joe Onorato <joeo@android.com> Wed May 20 11:24:20 2009 -0700
tree 996e044c8c7bf49463394bc911f0277d969bde5d
parent 40f5a4ea3bc90e43a442ab336f2342020bba86b3

Hook up the backup data writer, and add a utility to read the backup data files.

core/jni/android_backup_FileBackupHelper.cpp

diff --git a/core/jni/android_backup_FileBackupHelper.cpp b/core/jni/android_backup_FileBackupHelper.cpp
index c6de3a5..a05d812 100644
--- a/core/jni/android_backup_FileBackupHelper.cpp
+++ b/core/jni/android_backup_FileBackupHelper.cpp
@@ -28,7 +28,7 @@
 static jfieldID s_descriptorField = 0;
 
 static int
-performBackup_native(JNIEnv* env, jobject clazz, jstring basePath, jobject oldState, jobject data,
+performBackup_native(JNIEnv* env, jobject clazz, jstring basePath, jobject oldState, int data,
         jobject newState, jobjectArray files)
 {
     int err;
@@ -37,7 +37,7 @@
     LOGD("oldState=%p newState=%p data=%p\n", oldState, newState, data);
     int oldStateFD = oldState != NULL ? env->GetIntField(oldState, s_descriptorField) : -1;
     int newStateFD = env->GetIntField(newState, s_descriptorField);
-    int dataFD = env->GetIntField(data, s_descriptorField);
+    BackupDataWriter* dataStream = (BackupDataWriter*)data;
 
     char const* basePathUTF = env->GetStringUTFChars(basePath, NULL);
     LOGD("basePathUTF=\"%s\"\n", basePathUTF);
@@ -47,7 +47,7 @@
         filesUTF[i] = env->GetStringUTFChars((jstring)env->GetObjectArrayElement(files, i), NULL);
     }
 
-    err = back_up_files(oldStateFD, dataFD, newStateFD, basePathUTF, filesUTF, fileCount);
+    err = back_up_files(oldStateFD, dataStream, newStateFD, basePathUTF, filesUTF, fileCount);
 
     for (int i=0; i<fileCount; i++) {
         env->ReleaseStringUTFChars((jstring)env->GetObjectArrayElement(files, i), filesUTF[i]);
@@ -60,8 +60,7 @@
 
 static const JNINativeMethod g_methods[] = {
     { "performBackup_native",
-        "(Ljava/lang/String;Ljava/io/FileDescriptor;Ljava/io/FileDescriptor;"
-        "Ljava/io/FileDescriptor;[Ljava/lang/String;)I",
+        "(Ljava/lang/String;Ljava/io/FileDescriptor;ILjava/io/FileDescriptor;[Ljava/lang/String;)I",
         (void*)performBackup_native },
 };