diff options
Diffstat (limited to 'core/jni/android_app_backup_FullBackup.cpp')
| -rw-r--r-- | core/jni/android_app_backup_FullBackup.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/core/jni/android_app_backup_FullBackup.cpp b/core/jni/android_app_backup_FullBackup.cpp index 3cfaa82..2c02b37 100644 --- a/core/jni/android_app_backup_FullBackup.cpp +++ b/core/jni/android_app_backup_FullBackup.cpp @@ -23,6 +23,8 @@ #include <androidfw/BackupHelpers.h> +#include "core_jni_helpers.h" + #include <string.h> namespace android @@ -73,8 +75,6 @@ static struct { static jint backupToTar(JNIEnv* env, jobject clazz, jstring packageNameObj, jstring domainObj, jstring linkdomain, jstring rootpathObj, jstring pathObj, jobject dataOutputObj) { - int ret; - // Extract the various strings, allowing for null object pointers const char* packagenamechars = (packageNameObj) ? env->GetStringUTFChars(packageNameObj, NULL) : NULL; const char* rootchars = (rootpathObj) ? env->GetStringUTFChars(rootpathObj, NULL) : NULL; @@ -118,15 +118,11 @@ static const JNINativeMethod g_methods[] = { int register_android_app_backup_FullBackup(JNIEnv* env) { - jclass clazz = env->FindClass("android/app/backup/BackupDataOutput"); - LOG_FATAL_IF(clazz == NULL, "Unable to find class android.app.backup.BackupDataOutput"); + jclass clazz = FindClassOrDie(env, "android/app/backup/BackupDataOutput"); - sBackupDataOutput.mBackupWriter = env->GetFieldID(clazz, "mBackupWriter", "J"); - LOG_FATAL_IF(sBackupDataOutput.mBackupwriter == NULL, - "Unable to find mBackupWriter field in android.app.backup.BackupDataOutput"); + sBackupDataOutput.mBackupWriter = GetFieldIDOrDie(env, clazz, "mBackupWriter", "J"); - return AndroidRuntime::registerNativeMethods(env, "android/app/backup/FullBackup", - g_methods, NELEM(g_methods)); + return RegisterMethodsOrDie(env, "android/app/backup/FullBackup", g_methods, NELEM(g_methods)); } } |