diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-22 13:20:31 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-06-22 13:20:31 -0700 |
| commit | 4527acb0c39258792ae55604cb4d71006bf8d938 (patch) | |
| tree | f1e2b09db0abc31c15d56ec7e718a09aabd00861 /core/jni/AndroidRuntime.cpp | |
| parent | ffe4ddfe95e8b31e0cb579ab537a1373f6208bcc (diff) | |
| parent | 856dd8a60a70a5b7dca2bf2114872ce063e2ad60 (diff) | |
| download | frameworks_base-4527acb0c39258792ae55604cb4d71006bf8d938.zip frameworks_base-4527acb0c39258792ae55604cb4d71006bf8d938.tar.gz frameworks_base-4527acb0c39258792ae55604cb4d71006bf8d938.tar.bz2 | |
am 856dd8a6: Merge change 4952 into donut
Merge commit '856dd8a60a70a5b7dca2bf2114872ce063e2ad60'
* commit '856dd8a60a70a5b7dca2bf2114872ce063e2ad60':
Helper API cleanup. Allows multiple helpers to function,
Diffstat (limited to 'core/jni/AndroidRuntime.cpp')
| -rw-r--r-- | core/jni/AndroidRuntime.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index 1a1ebb4..f8a4df0 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -155,8 +155,7 @@ extern int register_android_util_Base64(JNIEnv* env); 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_FileBackupHelper(JNIEnv *env); -extern int register_android_backup_RestoreHelperBase(JNIEnv *env); +extern int register_android_backup_FileBackupHelperBase(JNIEnv *env); static AndroidRuntime* gCurRuntime = NULL; @@ -1241,8 +1240,7 @@ static const RegJNIRec gRegJNI[] = { REG_JNI(register_android_location_GpsLocationProvider), REG_JNI(register_android_backup_BackupDataInput), REG_JNI(register_android_backup_BackupDataOutput), - REG_JNI(register_android_backup_FileBackupHelper), - REG_JNI(register_android_backup_RestoreHelperBase), + REG_JNI(register_android_backup_FileBackupHelperBase), }; /* |