diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-25 18:04:05 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-25 18:04:05 -0700 |
| commit | b505ae4195d9b8a93c71b1f9da6d7d8c3aaa3c08 (patch) | |
| tree | 8e67108222e2134ba2ec0c99d5b6d34e8fc96794 /core/jni/AndroidRuntime.cpp | |
| parent | ee513b600efeb55040030a3dc9c8e7ef74b36149 (diff) | |
| parent | 4ababd922eac5931e0222862ff082dc29e012816 (diff) | |
| download | frameworks_base-b505ae4195d9b8a93c71b1f9da6d7d8c3aaa3c08.zip frameworks_base-b505ae4195d9b8a93c71b1f9da6d7d8c3aaa3c08.tar.gz frameworks_base-b505ae4195d9b8a93c71b1f9da6d7d8c3aaa3c08.tar.bz2 | |
Merge change 5459 into donut
* changes:
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 7350348..c815301 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -158,6 +158,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; @@ -1131,6 +1132,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), }; /* |