diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-25 18:06:01 -0700 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2009-06-25 18:06:01 -0700 |
commit | 2df7c15aa0e8f5afc804fd20250316f9e50fdb59 (patch) | |
tree | 040494201f8f408d32654c6064187695a42ffe8f /core/jni/AndroidRuntime.cpp | |
parent | 6d65c2304bfda221f1dafc4d7342720df86f104d (diff) | |
parent | b505ae4195d9b8a93c71b1f9da6d7d8c3aaa3c08 (diff) | |
download | frameworks_base-2df7c15aa0e8f5afc804fd20250316f9e50fdb59.zip frameworks_base-2df7c15aa0e8f5afc804fd20250316f9e50fdb59.tar.gz frameworks_base-2df7c15aa0e8f5afc804fd20250316f9e50fdb59.tar.bz2 |
am b505ae41: Merge change 5459 into donut
Merge commit 'b505ae4195d9b8a93c71b1f9da6d7d8c3aaa3c08'
* commit 'b505ae4195d9b8a93c71b1f9da6d7d8c3aaa3c08':
Make the BackupHelperDispatcher properly handle multiple helpers.
Diffstat (limited to 'core/jni/AndroidRuntime.cpp')
-rw-r--r-- | core/jni/AndroidRuntime.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index f8a4df0..c322b17 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -156,6 +156,7 @@ extern int register_android_location_GpsLocationProvider(JNIEnv* env); extern int register_android_backup_BackupDataInput(JNIEnv *env); extern int register_android_backup_BackupDataOutput(JNIEnv *env); extern int register_android_backup_FileBackupHelperBase(JNIEnv *env); +extern int register_android_backup_BackupHelperDispatcher(JNIEnv *env); static AndroidRuntime* gCurRuntime = NULL; @@ -1241,6 +1242,7 @@ static const RegJNIRec gRegJNI[] = { REG_JNI(register_android_backup_BackupDataInput), REG_JNI(register_android_backup_BackupDataOutput), REG_JNI(register_android_backup_FileBackupHelperBase), + REG_JNI(register_android_backup_BackupHelperDispatcher), }; /* |